1924. [port] libbind: hpux ia64 support. [RT #15473]

diff --git a/CHANGES b/CHANGES
index d8eba8120e11581cee86e1151586711da8dda2fe..96780719ad2cdd75f7622512d9c9850a2df6a18c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1924.  [port]          libbind: hpux ia64 support. [RT #15473]
+
 1923.  [bug]           ns_client_detach() called too early. [RT #15499]
 
        --- 9.2.6b1 released ---

diff --git a/lib/bind/configure b/lib/bind/configure
index 1f9c30a570a69013eea3252c31ad01a51cf26e90..882dab8fd89d1ab8931d866c836e95b35820f48d 100644 (file)
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.83.2.25 .
+# From configure.in Revision: 1.83.2.26 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -5752,7 +5752,12 @@ _ACEOF
        DO_PTHREADS="#define DO_PTHREADS 1"
        WANT_IRS_THREADSGR_OBJS="\${WANT_IRS_THREADSGR_OBJS}"
        WANT_IRS_THREADSPW_OBJS="\${WANT_IRS_THREADSPW_OBJS}"
-       WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}"
+       case $host in
+       ia64-hp-hpux11.*)
+               WANT_IRS_THREADS_OBJS="";;
+       *)
+               WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}";;
+       esac
        WANT_THREADS_OBJS="\${WANT_THREADS_OBJS}"
        thread_dir=pthreads
 else
@@ -6418,7 +6423,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530"
+                       STD_CWARNINGS="+w1 +W 474,530,2193"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"
@@ -6574,6 +6579,156 @@ fi
 #
 case "$host" in
        mips-sgi-irix*)
+               ;;
+       ia64-hp-hpux11.*)
+
+echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
+echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_socket+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char socket ();
+int
+main ()
+{
+socket ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_socket=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_socket=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
+if test $ac_cv_lib_socket_socket = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSOCKET 1
+_ACEOF
+
+  LIBS="-lsocket $LIBS"
+
+fi
+
+
+echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
+echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char inet_ntoa ();
+int
+main ()
+{
+inet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_nsl_inet_ntoa=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nsl_inet_ntoa=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
+if test $ac_cv_lib_nsl_inet_ntoa = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNSL 1
+_ACEOF
+
+  LIBS="-lnsl $LIBS"
+
+fi
+
                ;;
        *)
 
@@ -7447,7 +7602,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7450 "configure"' > conftest.$ac_ext
+  echo '#line 7605 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8444,7 +8599,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:8447:" \
+echo "$as_me:8602:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -9505,11 +9660,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9508: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9663: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9512: \$? = $ac_status" >&5
+   echo "$as_me:9667: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -9748,11 +9903,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9751: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9906: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9755: \$? = $ac_status" >&5
+   echo "$as_me:9910: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -9808,11 +9963,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9811: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9966: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9815: \$? = $ac_status" >&5
+   echo "$as_me:9970: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11993,7 +12148,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11996 "configure"
+#line 12151 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12091,7 +12246,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12094 "configure"
+#line 12249 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14288,11 +14443,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14291: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14446: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14295: \$? = $ac_status" >&5
+   echo "$as_me:14450: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14348,11 +14503,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14351: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14506: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14355: \$? = $ac_status" >&5
+   echo "$as_me:14510: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15709,7 +15864,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15712 "configure"
+#line 15867 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15807,7 +15962,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 15810 "configure"
+#line 15965 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16644,11 +16799,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16647: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16802: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16651: \$? = $ac_status" >&5
+   echo "$as_me:16806: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16704,11 +16859,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16707: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16862: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16711: \$? = $ac_status" >&5
+   echo "$as_me:16866: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18743,11 +18898,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18746: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18901: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18750: \$? = $ac_status" >&5
+   echo "$as_me:18905: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -18986,11 +19141,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18989: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19144: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18993: \$? = $ac_status" >&5
+   echo "$as_me:19148: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19046,11 +19201,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19049: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19204: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19053: \$? = $ac_status" >&5
+   echo "$as_me:19208: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21231,7 +21386,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21234 "configure"
+#line 21389 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21329,7 +21484,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21332 "configure"
+#line 21487 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -25361,6 +25516,10 @@ _ACEOF
 fi
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for getnetbyaddr_r" >&5
 echo $ECHO_N "checking for getnetbyaddr_r... $ECHO_C" >&6
 if test "${ac_cv_func_getnetbyaddr_r+set}" = set; then
@@ -25776,6 +25935,8 @@ NETENT_DATA="#undef NETENT_DATA"
 
 fi
 
+esac
+
 case "$host" in
 *dec-osf*) GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T int" ;;
 esac
@@ -26000,6 +26161,11 @@ fi
 
 
 
+
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for endnetent_r" >&5
 echo $ECHO_N "checking for endnetent_r... $ECHO_C" >&6
 if test "${ac_cv_func_endnetent_r+set}" = set; then
@@ -26262,6 +26428,7 @@ NET_R_END_RETURN="#define NET_R_END_RETURN void"
 
 fi
 
+esac
 
 
 
@@ -26839,6 +27006,10 @@ fi
 
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for gethostbyname_r" >&5
 echo $ECHO_N "checking for gethostbyname_r... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname_r+set}" = set; then
@@ -27129,6 +27300,7 @@ HOSTENT_DATA="#undef HOSTENT_DATA"
 
 fi
 
+esac
 
 
 
@@ -27139,6 +27311,10 @@ fi
 
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for endhostent_r" >&5
 echo $ECHO_N "checking for endhostent_r... $ECHO_C" >&6
 if test "${ac_cv_func_endhostent_r+set}" = set; then
@@ -27404,10 +27580,15 @@ HOST_R_ENT_ARGS="#undef HOST_R_ENT_ARGS /*empty*/"
 
 fi
 
+esac;
 
 
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for sethostent_r" >&5
 echo $ECHO_N "checking for sethostent_r... $ECHO_C" >&6
 if test "${ac_cv_func_sethostent_r+set}" = set; then
@@ -27661,6 +27842,7 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"
 
 fi
 
+esac
 
 
 
@@ -27832,6 +28014,10 @@ fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for getnetgrent_r" >&5
 echo $ECHO_N "checking for getnetgrent_r... $ECHO_C" >&6
 if test "${ac_cv_func_getnetgrent_r+set}" = set; then
@@ -28111,6 +28297,7 @@ NGR_R_RETURN="#define NGR_R_RETURN int"
 
 fi
 
+esac
 
 
 
@@ -28442,6 +28629,10 @@ _ACEOF
 fi
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for getprotoent_r" >&5
 echo $ECHO_N "checking for getprotoent_r... $ECHO_C" >&6
 if test "${ac_cv_func_getprotoent_r+set}" = set; then
@@ -28668,6 +28859,7 @@ PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *"
 
 fi
 
+esac
 
 
 
@@ -28676,6 +28868,10 @@ fi
 
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for endprotoent_r" >&5
 echo $ECHO_N "checking for endprotoent_r... $ECHO_C" >&6
 if test "${ac_cv_func_endprotoent_r+set}" = set; then
@@ -28832,10 +29028,15 @@ PROTO_R_ENT_ARGS="#undef PROTO_R_ENT_ARGS /*empty*/"
 
 fi
 
+esac
 
 
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for setprotoent_r" >&5
 echo $ECHO_N "checking for setprotoent_r... $ECHO_C" >&6
 if test "${ac_cv_func_setprotoent_r+set}" = set; then
@@ -28987,6 +29188,7 @@ PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN void"
 
 fi
 
+esac
 
 
 
@@ -29918,6 +30120,10 @@ _ACEOF
 fi
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for getservent_r" >&5
 echo $ECHO_N "checking for getservent_r... $ECHO_C" >&6
 if test "${ac_cv_func_getservent_r+set}" = set; then
@@ -30140,6 +30346,7 @@ SERV_R_RETURN="#define SERV_R_RETURN struct servent *"
 
 fi
 
+esac
 
 
 
@@ -30148,6 +30355,10 @@ fi
 
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for endservent_r" >&5
 echo $ECHO_N "checking for endservent_r... $ECHO_C" >&6
 if test "${ac_cv_func_endservent_r+set}" = set; then
@@ -30304,10 +30515,15 @@ SERV_R_ENT_ARGS="#undef SERV_R_ENT_ARGS /*empty*/"
 
 fi
 
+esac
 
 
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 echo "$as_me:$LINENO: checking for setservent_r" >&5
 echo $ECHO_N "checking for setservent_r... $ECHO_C" >&6
 if test "${ac_cv_func_setservent_r+set}" = set; then
@@ -30462,6 +30678,7 @@ SERV_R_SET_RETURN="#define SERV_R_SET_RETURN void"
 
 fi
 
+esac
 
 
 

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 653106cbf49388f72ae3ac038d5a62bbfbec0b84..540558fa73b783afdd9950def8c795ac5275eebc 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.83.2.25 $)
+AC_REVISION($Revision: 1.83.2.26 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -430,7 +430,12 @@ then
        DO_PTHREADS="#define DO_PTHREADS 1"
        WANT_IRS_THREADSGR_OBJS="\${WANT_IRS_THREADSGR_OBJS}"
        WANT_IRS_THREADSPW_OBJS="\${WANT_IRS_THREADSPW_OBJS}"
-       WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}"
+       case $host in
+       ia64-hp-hpux11.*)
+               WANT_IRS_THREADS_OBJS="";;
+       *)
+               WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}";;
+       esac
        WANT_THREADS_OBJS="\${WANT_THREADS_OBJS}"
        thread_dir=pthreads
 else
@@ -528,7 +533,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530"
+                       STD_CWARNINGS="+w1 +W 474,530,2193"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"
@@ -589,6 +594,10 @@ AC_CHECK_FUNC(catgets, AC_DEFINE(HAVE_CATGETS),)
 case "$host" in
        mips-sgi-irix*)
                ;;
+       ia64-hp-hpux11.*)
+               AC_CHECK_LIB(socket, socket)
+               AC_CHECK_LIB(nsl, inet_ntoa)
+               ;;
        *)
                AC_CHECK_LIB(d4r, gethostbyname_r)
                AC_CHECK_LIB(socket, socket)
@@ -1310,6 +1319,10 @@ AC_SUBST(GETGROUPLIST_ARGS)
 
 AC_CHECK_FUNC(setgroupent,,AC_DEFINE(NEED_SETGROUPENT))
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getnetbyaddr_r,
 AC_TRY_COMPILE(
 [
@@ -1433,6 +1446,8 @@ NET_R_RETURN="#define NET_R_RETURN struct netent *"
 GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T long"
 NETENT_DATA="#undef NETENT_DATA"
 )
+esac
+
 case "$host" in
 *dec-osf*) GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T int" ;;
 esac
@@ -1481,6 +1496,11 @@ AC_SUBST(NET_R_ENT_ARGS)
 AC_SUBST(NET_R_SET_RESULT)
 AC_SUBST(NET_R_SET_RETURN)
 
+
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endnetent_r,
 AC_TRY_COMPILE(
 [
@@ -1525,6 +1545,7 @@ NET_R_END_RETURN="#define NET_R_END_RETURN void"
 NET_R_END_RESULT="#define NET_R_END_RESULT(x) /*empty*/"
 NET_R_END_RETURN="#define NET_R_END_RETURN void"
 )
+esac
 AC_SUBST(NET_R_END_RESULT)
 AC_SUBST(NET_R_END_RETURN)
 
@@ -1577,6 +1598,10 @@ AC_SUBST(GROUP_R_SET_RESULT)
 AC_SUBST(GROUP_R_SET_RETURN)
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(gethostbyname_r,
 AC_TRY_COMPILE(
 [
@@ -1649,6 +1674,7 @@ HOST_R_RETURN="#define HOST_R_RETURN struct hostent *"
 HOST_R_SETANSWER="#undef HOST_R_SETANSWER"
 HOSTENT_DATA="#undef HOSTENT_DATA"
 )
+esac
 AC_SUBST(HOST_R_ARGS)
 AC_SUBST(HOST_R_BAD)
 AC_SUBST(HOST_R_COPY)
@@ -1659,6 +1685,10 @@ AC_SUBST(HOST_R_RETURN)
 AC_SUBST(HOST_R_SETANSWER)
 AC_SUBST(HOSTENT_DATA)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endhostent_r,
 AC_TRY_COMPILE([
 #undef _REENTRANT
@@ -1704,10 +1734,15 @@ HOST_R_END_RESULT="#define HOST_R_END_RESULT(x) /*empty*/"
 HOST_R_END_RETURN="#define HOST_R_END_RETURN void"
 HOST_R_ENT_ARGS="#undef HOST_R_ENT_ARGS /*empty*/"
 )
+esac;
 AC_SUBST(HOST_R_END_RESULT)
 AC_SUBST(HOST_R_END_RETURN)
 AC_SUBST(HOST_R_ENT_ARGS)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(sethostent_r,
 AC_TRY_COMPILE([
 #undef _REENTRANT
@@ -1743,6 +1778,7 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"],
 HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT"
 HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"
 )
+esac
 AC_SUBST(HOST_R_SET_RESULT)
 AC_SUBST(HOST_R_SET_RETURN)
 
@@ -1784,6 +1820,10 @@ SETGRENT_VOID="#undef SETGRENT_VOID"
 )
 AC_SUBST(SETGRENT_VOID)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getnetgrent_r,
 AC_TRY_COMPILE(
 [
@@ -1851,6 +1891,7 @@ NGR_R_COPY_ARGS="#define NGR_R_COPY_ARGS NGR_R_ARGS"
 NGR_R_OK="#define NGR_R_OK 1"
 NGR_R_RETURN="#define NGR_R_RETURN int"
 )
+esac
 AC_SUBST(NGR_R_ARGS)
 AC_SUBST(NGR_R_BAD)
 AC_SUBST(NGR_R_COPY)
@@ -1895,6 +1936,10 @@ AC_SUBST(NGR_R_SET_RETURN)
 
 AC_CHECK_FUNC(innetgr_r,,AC_DEFINE(NEED_INNETGR_R))
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getprotoent_r,
 AC_TRY_COMPILE(
 [
@@ -1949,6 +1994,7 @@ PROTO_R_OK="#define PROTO_R_OK pptr"
 PROTO_R_SETANSWER="#undef PROTO_R_SETANSWER"
 PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *"
 )
+esac
 AC_SUBST(PROTO_R_ARGS)
 AC_SUBST(PROTO_R_BAD)
 AC_SUBST(PROTO_R_COPY)
@@ -1957,6 +2003,10 @@ AC_SUBST(PROTO_R_OK)
 AC_SUBST(PROTO_R_SETANSWER)
 AC_SUBST(PROTO_R_RETURN)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endprotoent_r,
 AC_TRY_COMPILE(
 [
@@ -1980,10 +2030,15 @@ PROTO_R_END_RESULT="#define PROTO_R_END_RESULT(x) /*empty*/"
 PROTO_R_END_RETURN="#define PROTO_R_END_RETURN void"
 PROTO_R_ENT_ARGS="#undef PROTO_R_ENT_ARGS /*empty*/"
 )
+esac
 AC_SUBST(PROTO_R_END_RESULT)
 AC_SUBST(PROTO_R_END_RETURN)
 AC_SUBST(PROTO_R_ENT_ARGS)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(setprotoent_r,
 AC_TRY_COMPILE(
 [
@@ -2002,6 +2057,7 @@ PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN void"
 PROTO_R_SET_RESULT="#undef PROTO_R_SET_RESULT"
 PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN void"
 )
+esac
 AC_SUBST(PROTO_R_SET_RESULT)
 AC_SUBST(PROTO_R_SET_RETURN)
 
@@ -2091,6 +2147,10 @@ AC_SUBST(PASS_R_SET_RETURN)
 AC_CHECK_FUNC(getpwnam_r,,AC_DEFINE(NEED_GETPWNAM_R))
 AC_CHECK_FUNC(getpwuid_r,,AC_DEFINE(NEED_GETPWUID_R))
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getservent_r,
 AC_TRY_COMPILE([
 #undef __USE_MISC
@@ -2137,6 +2197,7 @@ SERV_R_OK="#define SERV_R_OK sptr"
 SERV_R_SETANSWER="#undef SERV_R_SETANSWER"
 SERV_R_RETURN="#define SERV_R_RETURN struct servent *"
 )
+esac
 AC_SUBST(SERV_R_ARGS)
 AC_SUBST(SERV_R_BAD)
 AC_SUBST(SERV_R_COPY)
@@ -2145,6 +2206,10 @@ AC_SUBST(SERV_R_OK)
 AC_SUBST(SERV_R_SETANSWER)
 AC_SUBST(SERV_R_RETURN)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endservent_r,
 AC_TRY_COMPILE(
 [
@@ -2169,10 +2234,15 @@ SERV_R_END_RESULT="#define SERV_R_END_RESULT(x) /*empty*/"
 SERV_R_END_RETURN="#define SERV_R_END_RETURN void "
 SERV_R_ENT_ARGS="#undef SERV_R_ENT_ARGS /*empty*/"
 )
+esac
 AC_SUBST(SERV_R_END_RESULT)
 AC_SUBST(SERV_R_END_RETURN)
 AC_SUBST(SERV_R_ENT_ARGS)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(setservent_r,
 AC_TRY_COMPILE(
 [
@@ -2194,6 +2264,7 @@ SERV_R_SET_RETURN="#define SERV_R_SET_RETURN void"
 SERV_R_SET_RESULT="#undef SERV_R_SET_RESULT"
 SERV_R_SET_RETURN="#define SERV_R_SET_RETURN void"
 )
+esac
 AC_SUBST(SERV_R_SET_RESULT)
 AC_SUBST(SERV_R_SET_RETURN)
 

diff --git a/lib/bind/dst/dst_api.c b/lib/bind/dst/dst_api.c
index 55fb17a03b7e5cbcd59544b72ac8eb755868d9ee..7ed69fc5ae567ddc07b33866b62fce5f05721741 100644 (file)
--- a/lib/bind/dst/dst_api.c
+++ b/lib/bind/dst/dst_api.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.4.2.8 2005/07/28 07:48:16 marka Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.4.2.9 2005/10/11 00:56:04 marka Exp $";
 #endif
 
 /*
@@ -956,7 +956,6 @@ dst_generate_key(const char *name, const int bits, const int exp,
                 const int flags, const int protocol, const int alg)
 {
        DST_KEY *new_key = NULL;
-       int res;
        int dnslen;
        u_char dns[2048];
 
@@ -978,7 +977,7 @@ dst_generate_key(const char *name, const int bits, const int exp,
                         alg));
                return (dst_free_key(new_key));
        }
-       if ((res = new_key->dk_func->generate(new_key, exp)) <= 0) {
+       if (new_key->dk_func->generate(new_key, exp) <= 0) {
                EREPORT(("dst_generate_key_pair(): Key generation failure %s %d %d %d\n",
                         new_key->dk_key_name, new_key->dk_alg,
                         new_key->dk_key_size, exp));

diff --git a/lib/bind/dst/support.c b/lib/bind/dst/support.c
index 9be93e13a6c2a817ab8fcb214f09c2140678ba61..92082a56970e202b7b70ccb2cca3980e309eb786 100644 (file)
--- a/lib/bind/dst/support.c
+++ b/lib/bind/dst/support.c
@@ -1,4 +1,4 @@
-static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/support.c,v 1.2.2.2 2005/07/28 07:48:17 marka Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/support.c,v 1.2.2.3 2005/10/11 00:56:04 marka Exp $";
 
 
 /*
@@ -103,7 +103,7 @@ dst_s_id_calc(const u_char *key, const int keysize)
        int size = keysize;
 
        if (!key || (keysize <= 0))
-               return (-1);
+               return (0xffffU);
  
        for (ac = 0; size > 1; size -= 2, kp += 2)
                ac += ((*kp) << 8) + *(kp + 1);

diff --git a/lib/bind/irs/dns_ho.c b/lib/bind/irs/dns_ho.c
index 7490c974a65b8d3786f90a21ca58ec228e3a3f67..f2f08dbce8a76a39eef42abc47cb042b85d0957b 100644 (file)
--- a/lib/bind/irs/dns_ho.c
+++ b/lib/bind/irs/dns_ho.c
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.12 2004/08/24 00:31:26 marka Exp $";
+static const char rcsid[] = "$Id: dns_ho.c,v 1.5.2.13 2005/10/11 00:56:04 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -688,7 +688,7 @@ gethostans(struct irs_ho *this,
 {
        struct pvt *pvt = (struct pvt *)this->private;
        int type, class, ancount, qdcount, n, haveanswer, had_error;
-       int error = NETDB_SUCCESS, arcount;
+       int error = NETDB_SUCCESS;
        int (*name_ok)(const char *);
        const HEADER *hp;
        const u_char *eom;
@@ -735,7 +735,6 @@ gethostans(struct irs_ho *this,
        hp = (const HEADER *)ansbuf;
        ancount = ntohs(hp->ancount);
        qdcount = ntohs(hp->qdcount);
-       arcount = ntohs(hp->arcount);
        bp = pvt->hostbuf;
        ep = pvt->hostbuf + sizeof(pvt->hostbuf);
        cp = ansbuf + HFIXEDSZ;

diff --git a/lib/bind/isc/memcluster.c b/lib/bind/isc/memcluster.c
index 55dc66a8719a2345c84a88dc388d9c379f03e31c..bfd2dd513489b6aab818f0bdcf411e25517ea8a2 100644 (file)
--- a/lib/bind/isc/memcluster.c
+++ b/lib/bind/isc/memcluster.c
@@ -24,7 +24,7 @@
 
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: memcluster.c,v 1.3.2.6 2005/08/22 01:34:48 marka Exp $";
+static const char rcsid[] = "$Id: memcluster.c,v 1.3.2.7 2005/10/11 00:56:05 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -108,8 +108,10 @@ static unsigned int        memlock = 0;
 
 static size_t                  max_size;
 static size_t                  mem_target;
+#ifndef MEMCLUSTER_BIG_MALLOC
 static size_t                  mem_target_half;
 static size_t                  mem_target_fudge;
+#endif
 static memcluster_element **   freelists;
 #ifdef MEMCLUSTER_RECORD
 static memcluster_element **   activelists;
@@ -146,8 +148,10 @@ meminit(size_t init_max_size, size_t target_size) {
                mem_target = DEF_MEM_TARGET;
        else
                mem_target = target_size;
+#ifndef MEMCLUSTER_BIG_MALLOC
        mem_target_half = mem_target / 2;
        mem_target_fudge = mem_target + mem_target / 4;
+#endif
        freelists = malloc(max_size * sizeof (memcluster_element *));
        stats = malloc((max_size+1) * sizeof (struct stats));
        if (freelists == NULL || stats == NULL) {

diff --git a/lib/bind/nameser/ns_parse.c b/lib/bind/nameser/ns_parse.c
index fb952084f7836885ba28c090ac3d1d24b1f191a0..5f62a04b3097ce74eaa4ea7f358e65f0c74e76a9 100644 (file)
--- a/lib/bind/nameser/ns_parse.c
+++ b/lib/bind/nameser/ns_parse.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.3.2.3 2005/08/12 01:37:02 marka Exp $";
+static const char rcsid[] = "$Id: ns_parse.c,v 1.3.2.4 2005/10/11 00:56:05 marka Exp $";
 #endif
 
 /* Import. */
@@ -140,7 +140,8 @@ ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
        int tmp;
 
        /* Make section right. */
-       if ((tmp = section) < 0 || section >= ns_s_max)
+       tmp = section;
+       if (tmp < 0 || section >= ns_s_max)
                RETERR(ENODEV);
        if (section != handle->_sect)
                setsection(handle, section);

diff --git a/lib/bind/nameser/ns_verify.c b/lib/bind/nameser/ns_verify.c
index 7d3ad66a2a2a6734245e9af3b7bc28b709420f9a..ca840541d2bb8c857ff63f48814ecba1fbbef2a3 100644 (file)
--- a/lib/bind/nameser/ns_verify.c
+++ b/lib/bind/nameser/ns_verify.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_verify.c,v 1.1.2.1 2004/03/09 09:17:37 marka Exp $";
+static const char rcsid[] = "$Id: ns_verify.c,v 1.1.2.2 2005/10/11 00:56:05 marka Exp $";
 #endif
 
 /* Import. */
@@ -144,7 +144,7 @@ ns_verify(u_char *msg, int *msglen, void *k,
        int n;
        int error;
        u_int16_t type, length;
-       u_int16_t fudge, sigfieldlen, id, otherfieldlen;
+       u_int16_t fudge, sigfieldlen, otherfieldlen;
 
        dst_init();
        if (msg == NULL || msglen == NULL || *msglen < 0)
@@ -198,9 +198,9 @@ ns_verify(u_char *msg, int *msglen, void *k,
        sigstart = cp;
        cp += sigfieldlen;
 
-       /* Read the original id and error. */
+       /* Skip id and read error. */
        BOUNDS_CHECK(cp, 2*INT16SZ);
-       GETSHORT(id, cp);
+       cp += INT16SZ;
        GETSHORT(error, cp);
 
        /* Parse the other data. */
@@ -341,12 +341,12 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
              int required)
 {
        HEADER *hp = (HEADER *)msg;
-       u_char *recstart, *rdatastart, *sigstart;
+       u_char *recstart, *sigstart;
        unsigned int sigfieldlen, otherfieldlen;
        u_char *cp, *eom = msg + *msglen, *cp2;
        char name[MAXDNAME], alg[MAXDNAME];
        u_char buf[MAXDNAME];
-       int n, type, length, fudge, id, error;
+       int n, type, length, fudge, error;
        time_t timesigned;
 
        if (msg == NULL || msglen == NULL || state == NULL)
@@ -403,7 +403,6 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
                return (NS_TSIG_ERROR_FORMERR);
 
        /* Read the algorithm name. */
-       rdatastart = cp;
        n = dn_expand(msg, eom, cp, alg, MAXDNAME);
        if (n < 0)
                return (NS_TSIG_ERROR_FORMERR);
@@ -429,9 +428,9 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
        sigstart = cp;
        cp += sigfieldlen;
 
-       /* Read the original id and error. */
+       /* Skip id and read error. */
        BOUNDS_CHECK(cp, 2*INT16SZ);
-       GETSHORT(id, cp);
+       cp += INT16SZ;
        GETSHORT(error, cp);
 
        /* Parse the other data. */

diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in
index 73d2dbdac2338d9c3112b68571b5b8bf64b9bc5d..0c956b71ed0ed9f97b537113cee182a0788f2397 100644 (file)
--- a/lib/bind/port_after.h.in
+++ b/lib/bind/port_after.h.in
@@ -299,7 +299,7 @@ GROUP_R_SET_RETURN setgrent_r(GROUP_R_ENT_ARGS);
 GROUP_R_END_RETURN endgrent_r(GROUP_R_ENT_ARGS);
 #endif
 
-#ifdef NEED_INNETGR_R
+#if defined(NEED_INNETGR_R) && defined(NGR_R_RETURN)
 NGR_R_RETURN
 innetgr_r(const char *, const char *, const char *, const char *);
 #endif
@@ -382,7 +382,9 @@ int isc__gettimeofday(struct timeval *tp, struct timezone *tzp);
 
 int getnetgrent(char **machinep, char **userp, char **domainp);
 
+#ifdef NGR_R_ARGS
 int getnetgrent_r(char **machinep, char **userp, char **domainp, NGR_R_ARGS);
+#endif
 
 #ifdef SETNETGRENT_ARGS
 void setnetgrent(SETNETGRENT_ARGS);

diff --git a/lib/bind/resolv/res_findzonecut.c b/lib/bind/resolv/res_findzonecut.c
index c1fa325a7270b476605121b80a8277dafbf62829..2649bdcdba7a013fac7d4d50cc44f7b96fb842f3 100644 (file)
--- a/lib/bind/resolv/res_findzonecut.c
+++ b/lib/bind/resolv/res_findzonecut.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.2.2.6 2004/09/16 07:07:24 marka Exp $";
+static const char rcsid[] = "$Id: res_findzonecut.c,v 1.2.2.7 2005/10/11 00:56:05 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -319,7 +319,6 @@ get_soa(res_state statp, const char *dname, ns_class class, int opts,
                for (i = 0; i < n; i++) {
                        const char *t;
                        const u_char *rdata;
-                       int rdlen;
                        ns_rr rr;
 
                        if (ns_parserr(&msg, sect, i, &rr) < 0) {
@@ -368,7 +367,6 @@ get_soa(res_state statp, const char *dname, ns_class class, int opts,
                        }
                        strcpy(zname, t);
                        rdata = ns_rr_rdata(rr);
-                       rdlen = ns_rr_rdlen(rr);
                        if (ns_name_uncompress(resp, ns_msg_end(msg), rdata,
                                               mname, msize) < 0) {
                                DPRINTF(("get_soa: ns_name_uncompress failed")
@@ -526,7 +524,6 @@ save_ns(res_state statp, ns_msg *msg, ns_sect sect,
                const u_char *rdata;
                rr_ns *nsrr;
                ns_rr rr;
-               int rdlen;
 
                if (ns_parserr(msg, sect, i, &rr) < 0) {
                        DPRINTF(("save_ns: ns_parserr(%s, %d) failed",
@@ -545,7 +542,6 @@ save_ns(res_state statp, ns_msg *msg, ns_sect sect,
                                return (-1);
                        }
                        rdata = ns_rr_rdata(rr);
-                       rdlen = ns_rr_rdlen(rr);
                        if (ns_name_uncompress(ns_msg_base(*msg),
                                               ns_msg_end(*msg), rdata,
                                               tname, sizeof tname) < 0) {

diff --git a/lib/bind/resolv/res_mkupdate.c b/lib/bind/resolv/res_mkupdate.c
index 0f93d7c73e3304f23dad7279007173dbca24b94d..471c2012ef5f6f9f2a34b1d5ec340b72ad389542 100644 (file)
--- a/lib/bind/resolv/res_mkupdate.c
+++ b/lib/bind/resolv/res_mkupdate.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_mkupdate.c,v 1.1.2.4 2004/06/03 04:45:16 marka Exp $";
+static const char rcsid[] = "$Id: res_mkupdate.c,v 1.1.2.5 2005/10/11 00:56:06 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -78,7 +78,7 @@ int
 res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
        ns_updrec *rrecp_start = rrecp_in;
        HEADER *hp;
-       u_char *cp, *sp1, *sp2, *startp, *endp;
+       u_char *cp, *sp2, *startp, *endp;
        int n, i, soanum, multiline;
        ns_updrec *rrecp;
        struct in_addr ina;
@@ -101,7 +101,6 @@ res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
        hp->id = htons(++statp->id);
        hp->opcode = ns_o_update;
        hp->rcode = NOERROR;
-       sp1 = buf + 2*INT16SZ;  /* save pointer to zocount */
        cp = buf + HFIXEDSZ;
        buflen -= HFIXEDSZ;
        dpp = dnptrs;