From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 17 Mar 2004 04:41:39 +0000 (+0000)
Subject: Import T_SRV fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_7~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da077ea31a65535ab1d5e4757c5e3257f9f9ce52;p=openldap

Import T_SRV fix from HEAD
---

diff --git a/CHANGES b/CHANGES
index a6a054a8df..f32a506259 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,8 @@ OpenLDAP 2.2.7 Engineering
 	Fixed monitor backend crash when used with overlays (ITS#3023)
 	Fixed oracle-related issues in back-sql (ITS#2641)
 	Fixed '=' escape in DN (ITS#3009)
+	Build Environment
+		Fixed libldap T_SRV portability bug
 	Documentation
 		Fixed ldapmodrdn(1) manpage (ITS#3003)
 
diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 4ef1e18b68..99c69c21de 100644
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -174,6 +174,11 @@ int ldap_domain2dn(
 	return LDAP_SUCCESS;
 }
 
+/* Bind 4 interface */
+#ifndef T_SRV
+#	define T_SRV 33
+#endif
+
 /*
  * Lookup and return LDAP servers for domain (using the DNS
  * SRV record _ldap._tcp.domain).
@@ -211,10 +216,6 @@ int ldap_domain2hostlist(
 	/* Bind 8/9 interface */
     len = res_query(request, ns_c_in, ns_t_srv, reply, sizeof(reply));
 #else
-	/* Bind 4 interface */
-#	ifndef T_SRV
-#		define T_SRV 33
-#	endif
     len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
 #endif
     if (len >= 0) {