From 03d78bbb31828d7ba7e578e5d7c76e7229c67b62 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Mon, 28 Feb 2005 10:15:16 +0000
Subject: [PATCH] * respect DO_HOST_LOOKUP config option
--HG--
extra : convert_revision : ab193dd162b03bdd935759fa667ff394a5e29734
---
dbutil.c | 8 +++++++-
options.h | 4 +---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dbutil.c b/dbutil.c
index 3ead9790..fbe170d5 100644
--- a/dbutil.c
+++ b/dbutil.c
@@ -397,6 +397,11 @@ char* getaddrhostname(struct sockaddr_storage * addr) {
char sbuf[NI_MAXSERV];
int ret;
unsigned int len;
+#ifdef DO_HOST_LOOKUP
+ const int flags = NI_NUMERICSERV;
+#else
+ const int flags = NI_NUMERICHOST | NI_NUMERICSERV;
+#endif
len = sizeof(struct sockaddr_storage);
/* Some platforms such as Solaris 8 require that len is the length
@@ -410,8 +415,9 @@ char* getaddrhostname(struct sockaddr_storage * addr) {
}
#endif
+
ret = getnameinfo((struct sockaddr*)addr, len, hbuf, sizeof(hbuf),
- sbuf, sizeof(sbuf), NI_NUMERICSERV);
+ sbuf, sizeof(sbuf), flags);
if (ret != 0) {
/* On some systems (Darwin does it) we get EINTR from getnameinfo
diff --git a/options.h b/options.h
index 11e7db1f..1dfb7387 100644
--- a/options.h
+++ b/options.h
@@ -96,9 +96,7 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
* if the random number source isn't good. In general this isn't required */
/* #define DSS_PROTOK */
-/* Whether to do reverse DNS lookups. This is advisable, though will add
- * code size with gethostbyname() etc, so for very small environments where
- * you are statically linking, you might want to undefine this */
+/* Whether to do reverse DNS lookups. */
#define DO_HOST_LOOKUP
/* Whether to print the message of the day (MOTD). This doesn't add much code
--
GitLab