From: Howard Chu <hyc@openldap.org>
Date: Wed, 5 Mar 2003 01:53:32 +0000 (+0000)
Subject: Use ldap_pvt_get_hname instead of ldap_pvt_gethostbyaddr_a
X-Git-Tag: NO_SLAP_OP_BLOCKS~177
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b21e69db0e47be1b5ed96f4460fcfa6790ff98b3;p=openldap

Use ldap_pvt_get_hname instead of ldap_pvt_gethostbyaddr_a
---

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index ea1d1b7e7c..560a0d21ca 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1381,7 +1381,7 @@ slapd_daemon_task(
 			slap_ssf_t ssf = 0;
 			char *authid = NULL;
 #ifdef SLAPD_RLOOKUPS
-			char *hebuf = NULL;
+			char hbuf[NI_MAXHOST];
 #endif
 
 			char	*dnsname = NULL;
@@ -1612,23 +1612,12 @@ slapd_daemon_task(
 			) {
 #ifdef SLAPD_RLOOKUPS
 				if ( use_reverse_lookup ) {
-					struct hostent he;
-					int herr;
-					struct hostent *hp = NULL;
-#  ifdef LDAP_PF_INET6
-					if ( from.sa_addr.sa_family == AF_INET6 )
-						ldap_pvt_gethostbyaddr_a(
-							(char *)&(from.sa_in6_addr.sin6_addr),
-							sizeof(from.sa_in6_addr.sin6_addr),
-							AF_INET6, &he, &hebuf,
-							&hp, &herr );
-					else
-#  endif /* LDAP_PF_INET6 */
-					ldap_pvt_gethostbyaddr_a(
-						(char *) &(from.sa_in_addr.sin_addr),
-						sizeof(from.sa_in_addr.sin_addr),
-						AF_INET, &he, &hebuf, &hp, &herr );
-					dnsname = hp ? ldap_pvt_str2lower( hp->h_name ) : NULL;
+					char *herr;
+					if (ldap_pvt_get_hname( &from, len, hbuf,
+						sizeof(hbuf), &herr ) == 0) {
+						ldap_pvt_str2lower( hbuf );
+						dnsname = hbuf;
+					}
 				}
 #else
 				dnsname = NULL;
@@ -1666,9 +1655,6 @@ slapd_daemon_task(
 				authid );
 
 			if( authid ) ch_free(authid);
-#ifdef SLAPD_RLOOKUPS
-			if( hebuf ) ldap_memfree(hebuf);
-#endif
 
 			if( id < 0 ) {
 #ifdef NEW_LOGGING