From aba062ee369aa48528f204e35369a312c77dfcdf Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 21 Nov 2003 18:56:52 +0000 Subject: [PATCH] (re)Add BIND4 support for NetBSD --- libraries/libldap/dnssrv.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c index fdf577402e..d1e3a9fa8b 100644 --- a/libraries/libldap/dnssrv.c +++ b/libraries/libldap/dnssrv.c @@ -28,11 +28,6 @@ #include #endif -/* Sometimes this is not defined. */ -#ifndef T_SRV -#define T_SRV 33 -#endif /* T_SRV */ - int ldap_dn2domain( LDAP_CONST char *dn_in, char **domainp) @@ -203,7 +198,16 @@ int ldap_domain2hostlist( #endif rc = LDAP_UNAVAILABLE; +#ifdef NS_HFIXEDSZ + /* 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) { unsigned char *p; char host[DNSBUFSIZ]; @@ -213,7 +217,13 @@ int ldap_domain2hostlist( /* Parse out query */ p = reply; +#ifdef NS_HFIXEDSZ + /* Bind 8/9 interface */ p += NS_HFIXEDSZ; +#else + /* Bind 4 interface */ + p += HFIXEDSZ; +#endif status = dn_expand(reply, reply + len, p, host, sizeof(host)); if (status < 0) { goto out; -- 2.39.5