From 2510f0bd84e7e9b07b8a193a6b0ff5f71c954ad8 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 14 May 2001 07:59:46 +0000 Subject: [PATCH] axi changes --- lib/bind/config.h.in | 1 + lib/bind/configure | 472 ++++++++++++++++++++----------------- lib/bind/configure.in | 20 +- lib/bind/irs/getaddrinfo.c | 2 + lib/bind/irs/getnameinfo.c | 8 + lib/bind/port_after.h.in | 22 ++ lib/bind/port_before.h.in | 4 + lib/bind/resolv/res_send.c | 4 +- 8 files changed, 310 insertions(+), 223 deletions(-) diff --git a/lib/bind/config.h.in b/lib/bind/config.h.in index a102a49bd1..be90a218e2 100644 --- a/lib/bind/config.h.in +++ b/lib/bind/config.h.in @@ -1,5 +1,6 @@ #undef HAVE_FCNTL_H #undef HAVE_PATHS_H +#undef HAVE_SYS_TIMERS_H #undef SYS_CDEFS_H #undef _POSIX_PTHREAD_SEMANTICS #undef POSIX_GETPWUID_R diff --git a/lib/bind/configure b/lib/bind/configure index 433626227d..7ff1c38ae1 100644 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.45 +# From configure.in Revision: 1.46 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 @@ -1398,7 +1398,7 @@ fi -for ac_hdr in fcntl.h db.h paths.h sys/time.h unistd.h sys/sockio.h sys/select.h +for ac_hdr in fcntl.h db.h paths.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/timers.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -3642,6 +3642,35 @@ else echo "$ac_t""no -- disabling runtime ipv6 support" 1>&6 ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO" fi +rm -f conftest* + + echo $ac_n "checking for sockaddr_storage""... $ac_c" 1>&6 +echo "configure:3649: checking for sockaddr_storage" >&5 + cat > conftest.$ac_ext < +#include +#include +$isc_netinetin6_hack +$isc_netinet6in6_hack + +int main() { +struct sockaddr_storage xyzzy; return (0); +; return 0; } +EOF +if { (eval echo configure:3664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + HAVE_SOCKADDR_STOR="#define HAVE_SOCKADDR_STORAGE 1" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 + HAVE_SOCKADDR_STORAGE="#undef HAVE_SOCKADDR_STORAGE" +fi rm -f conftest* ;; no) @@ -3649,6 +3678,7 @@ rm -f conftest* NEED_IN6ADDR_ANY="#undef NEED_IN6ADDR_ANY" ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO" HAVE_SIN6_SCOPE_ID="#define HAVE_SIN6_SCOPE_ID 1" + HAVE_SOCKADDR_STORAGE="#undef HAVE_SOCKADDR_STORAGE" ISC_IPV6_H="ipv6.h" ISC_IPV6_O="ipv6.$O" ISC_ISCIPV6_O="unix/ipv6.$O" @@ -3671,6 +3701,7 @@ esac + # # Check for network functions that are often missing. We do this # after the libtool checking, so we can put the right suffix on @@ -3678,9 +3709,9 @@ esac # which provides some (all?) of the desired functions. # echo $ac_n "checking for inet_ntop""... $ac_c" 1>&6 -echo "configure:3682: checking for inet_ntop" >&5 +echo "configure:3713: checking for inet_ntop" >&5 cat > conftest.$ac_ext < @@ -3690,7 +3721,7 @@ int main() { inet_ntop(0, 0, 0, 0); return (0); ; return 0; } EOF -if { (eval echo configure:3694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP" @@ -3705,9 +3736,9 @@ else fi rm -f conftest* echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 -echo "configure:3709: checking for inet_pton" >&5 +echo "configure:3740: checking for inet_pton" >&5 cat > conftest.$ac_ext < @@ -3717,7 +3748,7 @@ int main() { inet_pton(0, 0, 0); return (0); ; return 0; } EOF -if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON" @@ -3732,9 +3763,9 @@ else fi rm -f conftest* echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:3736: checking for inet_aton" >&5 +echo "configure:3767: checking for inet_aton" >&5 cat > conftest.$ac_ext < @@ -3744,7 +3775,7 @@ int main() { struct in_addr in; inet_aton(0, &in); return (0); ; return 0; } EOF -if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDATON="#undef ISC_PLATFORM_NEEDATON" @@ -3777,9 +3808,9 @@ EOF esac echo $ac_n "checking for sa_len in struct sockaddr""... $ac_c" 1>&6 -echo "configure:3781: checking for sa_len in struct sockaddr" >&5 +echo "configure:3812: checking for sa_len in struct sockaddr" >&5 cat > conftest.$ac_ext < @@ -3788,7 +3819,7 @@ int main() { struct sockaddr sa; sa.sa_len = 0; return (0); ; return 0; } EOF -if { (eval echo configure:3792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_SA_LEN="#define HAVE_SA_LEN 1" @@ -3854,9 +3885,9 @@ esac # Look for a 4.4BSD or 4.3BSD struct msghdr # echo $ac_n "checking for struct msghdr flavor""... $ac_c" 1>&6 -echo "configure:3858: checking for struct msghdr flavor" >&5 +echo "configure:3889: checking for struct msghdr flavor" >&5 cat > conftest.$ac_ext < @@ -3865,7 +3896,7 @@ int main() { struct msghdr msg; msg.msg_flags = 0; return (0); ; return 0; } EOF -if { (eval echo configure:3869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""4.4BSD" 1>&6 ISC_PLATFORM_MSGHDRFLAVOR="#define ISC_NET_BSD44MSGHDR 1" @@ -3883,9 +3914,9 @@ rm -f conftest* # Look for in_port_t. # echo $ac_n "checking for type in_port_t""... $ac_c" 1>&6 -echo "configure:3887: checking for type in_port_t" >&5 +echo "configure:3918: checking for type in_port_t" >&5 cat > conftest.$ac_ext < @@ -3894,7 +3925,7 @@ int main() { in_port_t port = 25; return (0); ; return 0; } EOF -if { (eval echo configure:3898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDPORTT="#undef ISC_PLATFORM_NEEDPORTT" @@ -3912,9 +3943,9 @@ rm -f conftest* # Check for addrinfo # echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6 -echo "configure:3916: checking for struct addrinfo" >&5 +echo "configure:3947: checking for struct addrinfo" >&5 cat > conftest.$ac_ext < @@ -3922,7 +3953,7 @@ int main() { struct addrinfo a; return (0); ; return 0; } EOF -if { (eval echo configure:3926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_NEEDADDRINFO="#undef ISC_LWRES_NEEDADDRINFO" @@ -3941,9 +3972,9 @@ rm -f conftest* echo $ac_n "checking for int sethostent""... $ac_c" 1>&6 -echo "configure:3945: checking for int sethostent" >&5 +echo "configure:3976: checking for int sethostent" >&5 cat > conftest.$ac_ext < @@ -3951,7 +3982,7 @@ int main() { int i = sethostent(0); return(0); ; return 0; } EOF -if { (eval echo configure:3955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_SETHOSTENTINT="#define ISC_LWRES_SETHOSTENTINT 1" @@ -3966,9 +3997,9 @@ rm -f conftest* echo $ac_n "checking for int endhostent""... $ac_c" 1>&6 -echo "configure:3970: checking for int endhostent" >&5 +echo "configure:4001: checking for int endhostent" >&5 cat > conftest.$ac_ext < @@ -3976,7 +4007,7 @@ int main() { int i = endhostent(); return(0); ; return 0; } EOF -if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_ENDHOSTENTINT="#define ISC_LWRES_ENDHOSTENTINT 1" @@ -3995,9 +4026,9 @@ case "$host" in GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T long";; *) echo $ac_n "checking for getnetbyaddr(in_addr_t, ...)""... $ac_c" 1>&6 -echo "configure:3999: checking for getnetbyaddr(in_addr_t, ...)" >&5 +echo "configure:4030: checking for getnetbyaddr(in_addr_t, ...)" >&5 cat > conftest.$ac_ext < @@ -4006,7 +4037,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T in_addr_t" @@ -4022,9 +4053,9 @@ esac echo $ac_n "checking for int setnetent""... $ac_c" 1>&6 -echo "configure:4026: checking for int setnetent" >&5 +echo "configure:4057: checking for int setnetent" >&5 cat > conftest.$ac_ext < @@ -4032,7 +4063,7 @@ int main() { int i = setnetent(0); return(0); ; return 0; } EOF -if { (eval echo configure:4036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_SETNETENTINT="#define ISC_LWRES_SETNETENTINT 1" @@ -4047,9 +4078,9 @@ rm -f conftest* echo $ac_n "checking for int endnetent""... $ac_c" 1>&6 -echo "configure:4051: checking for int endnetent" >&5 +echo "configure:4082: checking for int endnetent" >&5 cat > conftest.$ac_ext < @@ -4057,7 +4088,7 @@ int main() { int i = endnetent(); return(0); ; return 0; } EOF -if { (eval echo configure:4061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_ENDNETENTINT="#define ISC_LWRES_ENDNETENTINT 1" @@ -4072,9 +4103,9 @@ rm -f conftest* echo $ac_n "checking for gethostbyaddr(const void *, size_t, ...)""... $ac_c" 1>&6 -echo "configure:4076: checking for gethostbyaddr(const void *, size_t, ...)" >&5 +echo "configure:4107: checking for gethostbyaddr(const void *, size_t, ...)" >&5 cat > conftest.$ac_ext < @@ -4083,7 +4114,7 @@ int main() { return(0); ; return 0; } EOF -if { (eval echo configure:4087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_GETHOSTBYADDRVOID="#define ISC_LWRES_GETHOSTBYADDRVOID 1" @@ -4098,9 +4129,9 @@ rm -f conftest* echo $ac_n "checking for h_errno in netdb.h""... $ac_c" 1>&6 -echo "configure:4102: checking for h_errno in netdb.h" >&5 +echo "configure:4133: checking for h_errno in netdb.h" >&5 cat > conftest.$ac_ext < @@ -4108,7 +4139,7 @@ int main() { h_errno = 1; return(0); ; return 0; } EOF -if { (eval echo configure:4112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_NEEDHERRNO="#undef ISC_LWRES_NEEDHERRNO" @@ -4123,12 +4154,12 @@ rm -f conftest* echo $ac_n "checking for getipnodebyname""... $ac_c" 1>&6 -echo "configure:4127: checking for getipnodebyname" >&5 +echo "configure:4158: checking for getipnodebyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_getipnodebyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getipnodebyname=yes" else @@ -4172,12 +4203,12 @@ ISC_LWRES_GETIPNODEPROTO="#define ISC_LWRES_GETIPNODEPROTO 1" fi echo $ac_n "checking for getnameinfo""... $ac_c" 1>&6 -echo "configure:4176: checking for getnameinfo" >&5 +echo "configure:4207: checking for getnameinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getnameinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getnameinfo=yes" else @@ -4221,12 +4252,12 @@ ISC_LWRES_GETNAMEINFOPROTO="#define ISC_LWRES_GETNAMEINFOPROTO 1" fi echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:4225: checking for getaddrinfo" >&5 +echo "configure:4256: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getaddrinfo=yes" else @@ -4274,12 +4305,12 @@ ISC_LWRES_GETADDRINFOPROTO="#define ISC_LWRES_GETADDRINFOPROTO 1" fi echo $ac_n "checking for gai_strerror""... $ac_c" 1>&6 -echo "configure:4278: checking for gai_strerror" >&5 +echo "configure:4309: checking for gai_strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_gai_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gai_strerror=yes" else @@ -4328,12 +4359,12 @@ fi echo $ac_n "checking for pselect""... $ac_c" 1>&6 -echo "configure:4332: checking for pselect" >&5 +echo "configure:4363: checking for pselect" >&5 if eval "test \"`echo '$''{'ac_cv_func_pselect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pselect=yes" else @@ -4382,9 +4413,9 @@ fi # Look for a sysctl call to get the list of network interfaces. # echo $ac_n "checking for interface list sysctl""... $ac_c" 1>&6 -echo "configure:4386: checking for interface list sysctl" >&5 +echo "configure:4417: checking for interface list sysctl" >&5 cat > conftest.$ac_ext < @@ -4414,12 +4445,12 @@ rm -f conftest* # Check for some other useful functions that are not ever-present. # echo $ac_n "checking for strsep""... $ac_c" 1>&6 -echo "configure:4418: checking for strsep" >&5 +echo "configure:4449: checking for strsep" >&5 if eval "test \"`echo '$''{'ac_cv_func_strsep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strsep=yes" else @@ -4463,12 +4494,12 @@ ISC_PLATFORM_NEEDSTRSEP="#define ISC_PLATFORM_NEEDSTRSEP 1" fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:4467: checking for vsnprintf" >&5 +echo "configure:4498: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -4527,17 +4558,17 @@ fi # but that's defined elsewhere since we don't use configure on Win32. # echo $ac_n "checking printf format modifier for 64-bit integers""... $ac_c" 1>&6 -echo "configure:4531: checking printf format modifier for 64-bit integers" >&5 +echo "configure:4562: checking printf format modifier for 64-bit integers" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""default ll" 1>&6 ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"' else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""l" 1>&6 ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"' @@ -4557,12 +4588,12 @@ fi # Security Stuff # echo $ac_n "checking for chroot""... $ac_c" 1>&6 -echo "configure:4561: checking for chroot" >&5 +echo "configure:4592: checking for chroot" >&5 if eval "test \"`echo '$''{'ac_cv_func_chroot'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_chroot=yes" else @@ -4611,17 +4642,17 @@ for ac_hdr in linux/capability.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4615: checking for $ac_hdr" >&5 +echo "configure:4646: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4651,17 +4682,17 @@ for ac_hdr in sys/prctl.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4655: checking for $ac_hdr" >&5 +echo "configure:4686: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4692,9 +4723,9 @@ done # BSD/OS, and perhaps some others, don't define rlim_t. # echo $ac_n "checking for type rlim_t""... $ac_c" 1>&6 -echo "configure:4696: checking for type rlim_t" >&5 +echo "configure:4727: checking for type rlim_t" >&5 cat > conftest.$ac_ext < @@ -4704,7 +4735,7 @@ int main() { rlim_t rl = 19671212; return (0); ; return 0; } EOF -if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -4719,12 +4750,12 @@ else fi rm -f conftest* echo $ac_n "checking sizeof rlim_cur""... $ac_c" 1>&6 -echo "configure:4723: checking sizeof rlim_cur" >&5 +echo "configure:4754: checking sizeof rlim_cur" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4732,7 +4763,7 @@ else #include main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} EOF -if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""int" 1>&6 ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE int" @@ -4745,7 +4776,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4753,7 +4784,7 @@ else #include main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} EOF -if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""long int" 1>&6 ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long int" @@ -4766,7 +4797,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4774,7 +4805,7 @@ else #include main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} EOF -if { (eval echo configure:4778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""long long int" 1>&6 ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int" @@ -4801,12 +4832,12 @@ fi echo $ac_n "checking for getgrouplist""... $ac_c" 1>&6 -echo "configure:4805: checking for getgrouplist" >&5 +echo "configure:4836: checking for getgrouplist" >&5 if eval "test \"`echo '$''{'ac_cv_func_getgrouplist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getgrouplist=yes" else @@ -4844,7 +4875,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getgrouplist`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < int @@ -4855,7 +4886,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:4859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* GETGROUPLIST_ARGS="#define GETGROUPLIST_ARGS const char *name, int basegid, int *groups, int *ngroups" @@ -4880,12 +4911,12 @@ fi echo $ac_n "checking for setgroupent""... $ac_c" 1>&6 -echo "configure:4884: checking for setgroupent" >&5 +echo "configure:4915: checking for setgroupent" >&5 if eval "test \"`echo '$''{'ac_cv_func_setgroupent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setgroupent=yes" else @@ -4933,12 +4964,12 @@ fi echo $ac_n "checking for getnetbyaddr_r""... $ac_c" 1>&6 -echo "configure:4937: checking for getnetbyaddr_r" >&5 +echo "configure:4968: checking for getnetbyaddr_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getnetbyaddr_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getnetbyaddr_r=yes" else @@ -4976,7 +5007,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getnetbyaddr_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < struct netent * @@ -4987,7 +5018,7 @@ int main() { return (0) ; return 0; } EOF -if { (eval echo configure:4991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NET_R_ARGS="#define NET_R_ARGS char *buf, int buflen" @@ -5022,12 +5053,12 @@ fi echo $ac_n "checking for setnetent_r""... $ac_c" 1>&6 -echo "configure:5026: checking for setnetent_r" >&5 +echo "configure:5057: checking for setnetent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setnetent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setnetent_r=yes" else @@ -5078,12 +5109,12 @@ fi echo $ac_n "checking for endnetent_r""... $ac_c" 1>&6 -echo "configure:5082: checking for endnetent_r" >&5 +echo "configure:5113: checking for endnetent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endnetent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endnetent_r=yes" else @@ -5132,12 +5163,12 @@ fi echo $ac_n "checking for getgrnam_r""... $ac_c" 1>&6 -echo "configure:5136: checking for getgrnam_r" >&5 +echo "configure:5167: checking for getgrnam_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getgrnam_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getgrnam_r=yes" else @@ -5184,12 +5215,12 @@ EOF fi echo $ac_n "checking for getgrgid_r""... $ac_c" 1>&6 -echo "configure:5188: checking for getgrgid_r" >&5 +echo "configure:5219: checking for getgrgid_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getgrgid_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getgrgid_r=yes" else @@ -5237,12 +5268,12 @@ fi echo $ac_n "checking for getgrent_r""... $ac_c" 1>&6 -echo "configure:5241: checking for getgrent_r" >&5 +echo "configure:5272: checking for getgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getgrent_r=yes" else @@ -5280,7 +5311,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getgrent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5291,7 +5322,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* GROUP_R_ARGS="#define GROUP_R_ARGS char *buf, int buflen" @@ -5324,12 +5355,12 @@ fi echo $ac_n "checking for endgrent_r""... $ac_c" 1>&6 -echo "configure:5328: checking for endgrent_r" >&5 +echo "configure:5359: checking for endgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endgrent_r=yes" else @@ -5384,12 +5415,12 @@ fi echo $ac_n "checking for setgrent_r""... $ac_c" 1>&6 -echo "configure:5388: checking for setgrent_r" >&5 +echo "configure:5419: checking for setgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setgrent_r=yes" else @@ -5443,12 +5474,12 @@ fi echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:5447: checking for gethostbyname_r" >&5 +echo "configure:5478: checking for gethostbyname_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname_r=yes" else @@ -5486,7 +5517,7 @@ fi if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5497,7 +5528,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_ARGS="#define HOST_R_ARGS char *buf, int buflen, int *h_errnop" @@ -5515,7 +5546,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -5527,7 +5558,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_ARGS="#define HOST_R_ARGS struct hostent_data *hdptr" @@ -5570,12 +5601,12 @@ fi echo $ac_n "checking for endhostent_r""... $ac_c" 1>&6 -echo "configure:5574: checking for endhostent_r" >&5 +echo "configure:5605: checking for endhostent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endhostent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endhostent_r=yes" else @@ -5613,7 +5644,7 @@ fi if eval "test \"`echo '$ac_cv_func_'endhostent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5623,7 +5654,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_END_RESULT="#define HOST_R_END_RESULT(x) return (x)" HOST_R_END_RETURN="#define HOST_R_END_RETURN int" @@ -5634,7 +5665,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < @@ -5644,7 +5675,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_END_RESULT="#define HOST_R_END_RESULT(x)" @@ -5673,12 +5704,12 @@ fi echo $ac_n "checking for sethostent_r""... $ac_c" 1>&6 -echo "configure:5677: checking for sethostent_r" >&5 +echo "configure:5708: checking for sethostent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_sethostent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sethostent_r=yes" else @@ -5716,7 +5747,7 @@ fi if eval "test \"`echo '$ac_cv_func_'sethostent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5725,7 +5756,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT /*empty*/" HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void" @@ -5747,9 +5778,9 @@ fi echo $ac_n "checking struct passwd element pw_class""... $ac_c" 1>&6 -echo "configure:5751: checking struct passwd element pw_class" >&5 +echo "configure:5782: checking struct passwd element pw_class" >&5 cat > conftest.$ac_ext < @@ -5759,7 +5790,7 @@ int main() { struct passwd *pw; pw->pw_class = ""; ; return 0; } EOF -if { (eval echo configure:5763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -5777,7 +5808,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -5789,7 +5820,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SETPWENT_VOID="#define SETPWENT_VOID 1" @@ -5804,7 +5835,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -5816,7 +5847,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SETGRENT_VOID="#define SETGRENT_VOID 1" @@ -5831,12 +5862,12 @@ rm -f conftest* echo $ac_n "checking for getnetgrent_r""... $ac_c" 1>&6 -echo "configure:5835: checking for getnetgrent_r" >&5 +echo "configure:5866: checking for getnetgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getnetgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getnetgrent_r=yes" else @@ -5874,7 +5905,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getnetgrent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -5885,7 +5916,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:5889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NGR_R_ARGS="#define NGR_R_ARGS char *buf, int buflen" @@ -5921,12 +5952,12 @@ fi echo $ac_n "checking for endnetgrent_r""... $ac_c" 1>&6 -echo "configure:5925: checking for endnetgrent_r" >&5 +echo "configure:5956: checking for endnetgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endnetgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endnetgrent_r=yes" else @@ -5981,12 +6012,12 @@ fi echo $ac_n "checking for setnetgrent_r""... $ac_c" 1>&6 -echo "configure:5985: checking for setnetgrent_r" >&5 +echo "configure:6016: checking for setnetgrent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setnetgrent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setnetgrent_r=yes" else @@ -6039,12 +6070,12 @@ fi echo $ac_n "checking for innetgr_r""... $ac_c" 1>&6 -echo "configure:6043: checking for innetgr_r" >&5 +echo "configure:6074: checking for innetgr_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_innetgr_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_innetgr_r=yes" else @@ -6092,12 +6123,12 @@ fi echo $ac_n "checking for getprotoent_r""... $ac_c" 1>&6 -echo "configure:6096: checking for getprotoent_r" >&5 +echo "configure:6127: checking for getprotoent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getprotoent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getprotoent_r=yes" else @@ -6135,7 +6166,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getprotoent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -6148,7 +6179,7 @@ return (0); ; return 0; } EOF -if { (eval echo configure:6152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROTO_R_ARGS="#define PROTO_R_ARGS char *buf, int buflen" @@ -6184,12 +6215,12 @@ fi echo $ac_n "checking for endprotoent_r""... $ac_c" 1>&6 -echo "configure:6188: checking for endprotoent_r" >&5 +echo "configure:6219: checking for endprotoent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endprotoent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endprotoent_r=yes" else @@ -6240,12 +6271,12 @@ fi echo $ac_n "checking for setprotoent_r""... $ac_c" 1>&6 -echo "configure:6244: checking for setprotoent_r" >&5 +echo "configure:6275: checking for setprotoent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setprotoent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setprotoent_r=yes" else @@ -6294,12 +6325,12 @@ fi echo $ac_n "checking for getpwent_r""... $ac_c" 1>&6 -echo "configure:6298: checking for getpwent_r" >&5 +echo "configure:6329: checking for getpwent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpwent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getpwent_r=yes" else @@ -6337,7 +6368,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getpwent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -6351,7 +6382,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PASS_R_ARGS="#define PASS_R_ARGS char *buf, int buflen" PASS_R_BAD="#define PASS_R_BAD NULL" @@ -6389,12 +6420,12 @@ fi echo $ac_n "checking for endpwent_r""... $ac_c" 1>&6 -echo "configure:6393: checking for endpwent_r" >&5 +echo "configure:6424: checking for endpwent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endpwent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endpwent_r=yes" else @@ -6432,7 +6463,7 @@ fi if eval "test \"`echo '$ac_cv_func_'endpwent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -6442,7 +6473,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PASS_R_END_RESULT="#define PASS_R_END_RESULT(x) /*empty*/" PASS_R_END_RETURN="#define PASS_R_END_RETURN void" @@ -6470,12 +6501,12 @@ fi echo $ac_n "checking for setpassent_r""... $ac_c" 1>&6 -echo "configure:6474: checking for setpassent_r" >&5 +echo "configure:6505: checking for setpassent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpassent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setpassent_r=yes" else @@ -6522,12 +6553,12 @@ EOF fi echo $ac_n "checking for setpassent""... $ac_c" 1>&6 -echo "configure:6526: checking for setpassent" >&5 +echo "configure:6557: checking for setpassent" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpassent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setpassent=yes" else @@ -6575,12 +6606,12 @@ fi echo $ac_n "checking for setpwent_r""... $ac_c" 1>&6 -echo "configure:6579: checking for setpwent_r" >&5 +echo "configure:6610: checking for setpwent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpwent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setpwent_r=yes" else @@ -6618,7 +6649,7 @@ fi if eval "test \"`echo '$ac_cv_func_'setpwent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -6628,7 +6659,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PASS_R_SET_RESULT="#undef PASS_R_SET_RESULT /* empty */" PASS_R_SET_RETURN="#define PASS_R_SET_RETURN int" @@ -6654,12 +6685,12 @@ fi echo $ac_n "checking for getpwnam_r""... $ac_c" 1>&6 -echo "configure:6658: checking for getpwnam_r" >&5 +echo "configure:6689: checking for getpwnam_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpwnam_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getpwnam_r=yes" else @@ -6706,12 +6737,12 @@ EOF fi echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6 -echo "configure:6710: checking for getpwuid_r" >&5 +echo "configure:6741: checking for getpwuid_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpwuid_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getpwuid_r=yes" else @@ -6759,12 +6790,12 @@ fi echo $ac_n "checking for getservent_r""... $ac_c" 1>&6 -echo "configure:6763: checking for getservent_r" >&5 +echo "configure:6794: checking for getservent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_getservent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getservent_r=yes" else @@ -6802,7 +6833,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getservent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -6813,7 +6844,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:6817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen" @@ -6849,12 +6880,12 @@ fi echo $ac_n "checking for endservent_r""... $ac_c" 1>&6 -echo "configure:6853: checking for endservent_r" >&5 +echo "configure:6884: checking for endservent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_endservent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_endservent_r=yes" else @@ -6905,12 +6936,12 @@ fi echo $ac_n "checking for setservent_r""... $ac_c" 1>&6 -echo "configure:6909: checking for setservent_r" >&5 +echo "configure:6940: checking for setservent_r" >&5 if eval "test \"`echo '$''{'ac_cv_func_setservent_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setservent_r=yes" else @@ -7036,7 +7067,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7040: checking for $ac_word" >&5 +echo "configure:7071: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7083,7 +7114,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7087: checking for $ac_word" >&5 +echo "configure:7118: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7125,7 +7156,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7129: checking for $ac_word" >&5 +echo "configure:7160: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PDFTEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7170,7 +7201,7 @@ done SGMLDIR="" echo $ac_n "checking for SGML files""... $ac_c" 1>&6 -echo "configure:7174: checking for SGML files" >&5 +echo "configure:7205: checking for SGML files" >&5 for d in /usr/pkg/share/sgml /usr/local/share/sgml do if test -f $d/docbook/dsssl/modular/html/docbook.dsl @@ -7195,7 +7226,7 @@ fi XGMLDIR="" echo $ac_n "checking for XML files""... $ac_c" 1>&6 -echo "configure:7199: checking for XML files" >&5 +echo "configure:7230: checking for XML files" >&5 for d in /usr/pkg/share/xml /usr/local/share/xml do if test -f $d/dtd/docbook/docbookx.dtd @@ -7479,6 +7510,7 @@ s%@ISC_IPV6_O@%$ISC_IPV6_O%g s%@ISC_ISCIPV6_O@%$ISC_ISCIPV6_O%g s%@ISC_IPV6_C@%$ISC_IPV6_C%g s%@HAVE_SIN6_SCOPE_ID@%$HAVE_SIN6_SCOPE_ID%g +s%@HAVE_SOCKADDR_STORAGE@%$HAVE_SOCKADDR_STORAGE%g s%@ISC_PLATFORM_NEEDNTOP@%$ISC_PLATFORM_NEEDNTOP%g s%@ISC_PLATFORM_NEEDPTON@%$ISC_PLATFORM_NEEDPTON%g s%@ISC_PLATFORM_NEEDATON@%$ISC_PLATFORM_NEEDATON%g @@ -7622,7 +7654,7 @@ cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=50 # Maximum number of lines to put in a sed script. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. ac_end=$ac_max_sed_cmds # Line after last line for current file. diff --git a/lib/bind/configure.in b/lib/bind/configure.in index 59bd0f0a79..3ac2756dd2 100644 --- a/lib/bind/configure.in +++ b/lib/bind/configure.in @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.46 $) +AC_REVISION($Revision: 1.47 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -195,7 +195,7 @@ AC_PROG_CC AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h db.h paths.h sys/time.h unistd.h sys/sockio.h sys/select.h) +AC_CHECK_HEADERS(fcntl.h db.h paths.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/timers.h) AC_C_CONST @@ -942,12 +942,27 @@ $isc_netinet6in6_hack ISC_PLATFORM_HAVEIN6PKTINFO="#define ISC_PLATFORM_HAVEIN6PKTINFO 1"], [AC_MSG_RESULT(no -- disabling runtime ipv6 support) ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO"]) + + AC_MSG_CHECKING(for sockaddr_storage) + AC_TRY_COMPILE([ +#include +#include +#include +$isc_netinetin6_hack +$isc_netinet6in6_hack +], + [struct sockaddr_storage xyzzy; return (0);], + [AC_MSG_RESULT(yes) + HAVE_SOCKADDR_STOR="#define HAVE_SOCKADDR_STORAGE 1"], + [AC_MSG_RESULT(no) + HAVE_SOCKADDR_STORAGE="#undef HAVE_SOCKADDR_STORAGE"]) ;; no) HAS_INET6_STRUCTS="#undef HAS_INET6_STRUCTS" NEED_IN6ADDR_ANY="#undef NEED_IN6ADDR_ANY" ISC_PLATFORM_HAVEIN6PKTINFO="#undef ISC_PLATFORM_HAVEIN6PKTINFO" HAVE_SIN6_SCOPE_ID="#define HAVE_SIN6_SCOPE_ID 1" + HAVE_SOCKADDR_STORAGE="#undef HAVE_SOCKADDR_STORAGE" ISC_IPV6_H="ipv6.h" ISC_IPV6_O="ipv6.$O" ISC_ISCIPV6_O="unix/ipv6.$O" @@ -969,6 +984,7 @@ AC_SUBST(ISC_IPV6_O) AC_SUBST(ISC_ISCIPV6_O) AC_SUBST(ISC_IPV6_C) AC_SUBST(HAVE_SIN6_SCOPE_ID) +AC_SUBST(HAVE_SOCKADDR_STORAGE) # # Check for network functions that are often missing. We do this diff --git a/lib/bind/irs/getaddrinfo.c b/lib/bind/irs/getaddrinfo.c index a5b1558d7f..f91bd6920a 100644 --- a/lib/bind/irs/getaddrinfo.c +++ b/lib/bind/irs/getaddrinfo.c @@ -875,7 +875,9 @@ explore_numeric_scope(pai, hostname, servname, res) free(hostname2); return(EAI_NONAME); /* XXX: is return OK? */ } +#ifdef HAVE_SIN6_SCOPE_ID sin6->sin6_scope_id = scopeid; +#endif } } diff --git a/lib/bind/irs/getnameinfo.c b/lib/bind/irs/getnameinfo.c index b2f4fbb877..2ab45ba615 100644 --- a/lib/bind/irs/getnameinfo.c +++ b/lib/bind/irs/getnameinfo.c @@ -227,6 +227,7 @@ ip6_parsenumeric(sa, addr, host, hostlen, flags) return EAI_MEMORY; strcpy(host, numaddr); +#ifdef HAVE_SIN6_SCOPE_ID if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) { char scopebuf[MAXHOSTNAMELEN]; /* XXX */ int scopelen; @@ -244,6 +245,7 @@ ip6_parsenumeric(sa, addr, host, hostlen, flags) host[numaddrlen] = SCOPE_DELIMITER; host[numaddrlen + 1 + scopelen] = '\0'; } +#endif return 0; } @@ -261,11 +263,13 @@ ip6_sa2str(sa6, buf, bufsiz, flags) const struct in6_addr *a6 = &sa6->sin6_addr; #endif +#ifdef HAVE_SIN6_SCOPE_ID #ifdef NI_NUMERICSCOPE if (flags & NI_NUMERICSCOPE) { return(snprintf(buf, bufsiz, "%d", sa6->sin6_scope_id)); } #endif +#endif #ifdef USE_IFNAMELINKID /* @@ -288,5 +292,9 @@ ip6_sa2str(sa6, buf, bufsiz, flags) #endif /* last resort */ +#ifdef HAVE_SIN6_SCOPE_ID return(snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id)); +#else + return(snprintf(buf, bufsiz, "0")); /* no scope */ +#endif } diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in index 57a43cb48e..1f651864f9 100644 --- a/lib/bind/port_after.h.in +++ b/lib/bind/port_after.h.in @@ -19,6 +19,7 @@ @HAVE_SIN6_SCOPE_ID@ @NEED_IN6ADDR_ANY@ @HAS_IN_ADDR6@ +@HAVE_SOCKADDR_STORAGE@ /* XXX sunos and cygwin needs O_NDELAY */ #define PORT_NONBLOCK O_NONBLOCK @@ -71,6 +72,27 @@ struct sockaddr_in6 { #define INET6 1 #endif /* HAS_INET6_STRUCTS */ +#ifndef HAVE_SOCKADDR_STORAGE +#define __SS_MAXSIZE 128 +#define __SS_ALLIGSIZE (sizeof (long)) + +struct sockaddr_storage { +#ifdef HAVE_SA_LEN + u_int8_t ss_len; /* address length */ + u_int8_t ss_family; /* address family */ + char __ss_pad1[__SS_ALLIGSIZE - 2 * sizeof(u_int8_t)]; + long __ss_align; + char __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE]; +#else + u_int16_t ss_family; /* address family */ + char __ss_pad1[__SS_ALLIGSIZE - sizeof(u_int16_t)]; + long __ss_align; + char __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE]; +#endif +}; +#endif + + #if !defined(HAS_INET6_STRUCTS) || defined(NEED_IN6ADDR_ANY) #define in6addr_any isc_in6addr_any extern const struct in6_addr in6addr_any; diff --git a/lib/bind/port_before.h.in b/lib/bind/port_before.h.in index 229d5968c4..263dc71f27 100644 --- a/lib/bind/port_before.h.in +++ b/lib/bind/port_before.h.in @@ -1,6 +1,10 @@ #ifndef port_before_h #define port_before_h #include +#ifdef HAVE_SYS_TIMERS_H +#include +#endif + @WANT_IRS_GR@ @WANT_IRS_NIS@ diff --git a/lib/bind/resolv/res_send.c b/lib/bind/resolv/res_send.c index 016cc6544f..4445be3b63 100644 --- a/lib/bind/resolv/res_send.c +++ b/lib/bind/resolv/res_send.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_send.c,v 1.2 2001/04/23 02:59:17 marka Exp $"; +static const char rcsid[] = "$Id: res_send.c,v 1.3 2001/05/14 07:59:46 marka Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -1042,7 +1042,9 @@ sock_eq(struct sockaddr *a, struct sockaddr *b) { a6 = (struct sockaddr_in6 *)a; b6 = (struct sockaddr_in6 *)b; return a6->sin6_port == b6->sin6_port && +#ifdef HAVE_SIN6_SCOPE_ID a6->sin6_scope_id == b6->sin6_scope_id && +#endif IN6_ARE_ADDR_EQUAL(&a6->sin6_addr, &b6->sin6_addr); #endif default: