diff options
128 files changed, 3919 insertions, 933 deletions
@@ -1,4 +1,26 @@ + --- 9.2.0b1 released --- + + 939. [port] Add the --disable-linux-caps option to configure for + systems that manage capabilities outside of named. + [RT #1503] + + 938. [placeholder] + + 937. [bug] A race when shutting down a zone could trigger a + INSIST() failure. [RT #1034] + + 936. [func] Warn about IPv4 addresses that are not complete + dotted quads. [RT #1084] + + 935. [bug] inet_pton failed to reject leading zeros. + + 934. [port] Deal with systems where accept() spuriously returns + ECONNRESET. + + 933. [bug] configure failed doing libbind on platforms not + supported by BIND 8. [RT #1496] + --- 9.2.0a3 released --- 932. [bug] Use INSTALL_SCRIPT, not INSTALL_PROGRAM, @@ -45,9 +45,9 @@ BIND 9 -BIND 9.2.0a3 +BIND 9.2.0b1 - BIND 9.2.0a3 is an alpha release of BIND 9.2.0. + BIND 9.2.0b1 is the first beta release of BIND 9.2.0. It includes a number of new features over 9.1, including: - The size of the cache can now be limited using the @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: acconfig.h,v 1.34 2001/07/04 00:34:40 bwelling Exp $ */ +/* $Id: acconfig.h,v 1.35 2001/07/14 01:55:04 gson Exp $ */ /*** *** This file is not to be included by any public header files, because @@ -84,9 +84,6 @@ /* define if getc_unlocked() is available */ #undef HAVE_GETCUNLOCKED -/* define if rlim_t is defined via sys/types.h or sys/resource.h */ -#undef HAVE_RLIM_T - /* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ #undef SHUTUP_SPUTAUX #ifdef SHUTUP_SPUTAUX diff --git a/bin/check/named-checkconf.c b/bin/check/named-checkconf.c index 68824e51..c2907d87 100644 --- a/bin/check/named-checkconf.c +++ b/bin/check/named-checkconf.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named-checkconf.c,v 1.9 2001/06/29 01:04:55 gson Exp $ */ +/* $Id: named-checkconf.c,v 1.10 2001/07/16 17:53:22 gson Exp $ */ #include <config.h> @@ -77,6 +77,7 @@ main(int argc, char **argv) { const char *conffile = NULL; isc_mem_t *mctx = NULL; isc_result_t result; + int exit_status = 0; while ((c = isc_commandline_parse(argc, argv, "t:v")) != EOF) { switch (c) { @@ -121,7 +122,9 @@ main(int argc, char **argv) { ISC_R_SUCCESS) exit(1); - RUNTIME_CHECK(cfg_check_namedconf(config, log, mctx) == ISC_R_SUCCESS); + result = cfg_check_namedconf(config, log, mctx); + if (result != ISC_R_SUCCESS) + exit_status = 1; cfg_obj_destroy(parser, &config); @@ -131,5 +134,5 @@ main(int argc, char **argv) { isc_mem_destroy(&mctx); - return (0); + return (exit_status); } diff --git a/bin/dig/dig.1 b/bin/dig/dig.1 index a1882bfc..1ca90429 100644 --- a/bin/dig/dig.1 +++ b/bin/dig/dig.1 @@ -59,8 +59,9 @@ A typical invocation of \fBdig\fR looks like: where: .TP \fBserver\fR -is the name or IP address of the name server to query. An IPv4 -address can be provided in dotted-decimal notation. When the supplied +is the name or IP address of the name server to query. This can be an IPv4 +address in dotted-decimal notation or an IPv6 +address in colon-delimited notation. When the supplied \fIserver\fR argument is a hostname, \fBdig\fR resolves that name before querying that name server. If no \fIserver\fR argument is provided, diff --git a/bin/dig/dig.html b/bin/dig/dig.html index eda48948..133e9a42 100644 --- a/bin/dig/dig.html +++ b/bin/dig/dig.html @@ -216,8 +216,9 @@ CLASS="CONSTANT" ></DT ><DD ><P ->is the name or IP address of the name server to query. An IPv4 -address can be provided in dotted-decimal notation. When the supplied +>is the name or IP address of the name server to query. This can be an IPv4 +address in dotted-decimal notation or an IPv6 +address in colon-delimited notation. When the supplied <TT CLASS="PARAMETER" ><I diff --git a/bin/named/main.c b/bin/named/main.c index a17606a3..a5fc459c 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: main.c,v 1.116 2001/06/28 01:08:24 marka Exp $ */ +/* $Id: main.c,v 1.117 2001/07/16 17:32:49 gson Exp $ */ #include <config.h> @@ -482,20 +482,13 @@ setup(void) { * directory's name before possibly changing to another directory. */ if (! isc_file_isabsolute(ns_g_conffile)) { - result = isc_dir_current(absolute_conffile, - sizeof(absolute_conffile), ISC_TRUE); + result = isc_file_absolutepath(ns_g_conffile, + absolute_conffile, + sizeof(absolute_conffile)); if (result != ISC_R_SUCCESS) - ns_main_earlyfatal("getting current directory failed: " - "%s", isc_result_totext(result)); - - if (strlen(absolute_conffile) + strlen(ns_g_conffile) + 1 > - sizeof(absolute_conffile)) - ns_main_earlyfatal("configuration filename too long: " - "%s%s", absolute_conffile, - ns_g_conffile); - - strcat(absolute_conffile, ns_g_conffile); - + ns_main_earlyfatal("could not construct absolute path of " + "configuration file: %s", + isc_result_totext(result)); ns_g_conffile = absolute_conffile; } diff --git a/bin/named/server.c b/bin/named/server.c index 96dc757a..570a0169 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: server.c,v 1.333 2001/07/11 22:22:37 bwelling Exp $ */ +/* $Id: server.c,v 1.334 2001/07/16 18:33:30 gson Exp $ */ #include <config.h> @@ -1416,8 +1416,7 @@ directory_callback(const char *clausename, cfg_obj_t *obj, void *arg) { */ directory = cfg_obj_asstring(obj); - if (!isc_file_isabsolute(directory) && - !isc_file_iscurrentdir(directory)) + if (! isc_file_ischdiridempotent(directory)) cfg_obj_log(obj, ns_g_lctx, ISC_LOG_WARNING, "option 'directory' contains relative path '%s'", directory); diff --git a/bin/nsupdate/nsupdate.8 b/bin/nsupdate/nsupdate.8 index 9a3c8c44..d3e9b8bb 100644 --- a/bin/nsupdate/nsupdate.8 +++ b/bin/nsupdate/nsupdate.8 @@ -138,8 +138,9 @@ Every update request consists of zero or more prerequisites and zero or more updates. This allows a suitably authenticated update request to proceed if some specified resource records are present or missing from the zone. -A blank input line causes the accumulated commands to be sent as one Dynamic -DNS update request to the name server. +A blank input line (or the \fBsend\fR command) causes the +accumulated commands to be sent as one Dynamic DNS update request to the +name server. .PP The command formats and their meaning are as follows: .TP @@ -255,6 +256,13 @@ Adds a new resource record with the specified \fIclass\fR and \fIdata\fR. +.TP +\fBshow\fR +Displays the current message, containing all of the prerequisites and +updates specified since the last send. +.TP +\fBsend\fR +Sends the current message. This is equivalent to entering a blank line. .PP Lines beginning with a semicolon are comments, and are ignored. .SH "EXAMPLES" diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 13bbffaf..aca4a1f9 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsupdate.c,v 1.99 2001/07/12 04:13:39 bwelling Exp $ */ +/* $Id: nsupdate.c,v 1.100 2001/07/14 20:17:48 bwelling Exp $ */ #include <config.h> @@ -368,7 +368,7 @@ doshutdown(void) { isc_mem_put(mctx, localaddr, sizeof(isc_sockaddr_t)); if (key != NULL) { - debug("Freeing key"); + ddebug("Freeing key"); dns_tsigkey_detach(&key); } @@ -376,13 +376,13 @@ doshutdown(void) { dns_message_destroy(&updatemsg); if (is_dst_up) { - debug("Destroy DST lib"); + ddebug("Destroy DST lib"); dst_lib_destroy(); is_dst_up = ISC_FALSE; } if (entp != NULL) { - debug("Detach from entropy"); + ddebug("Detach from entropy"); isc_entropy_detach(&entp); } diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook index e61c5a42..178b8269 100644 --- a/bin/nsupdate/nsupdate.docbook +++ b/bin/nsupdate/nsupdate.docbook @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: nsupdate.docbook,v 1.6 2001/07/02 18:48:26 gson Exp $ --> +<!-- $Id: nsupdate.docbook,v 1.8 2001/07/14 18:30:01 bwelling Exp $ --> <refentry> <refentryinfo> @@ -177,8 +177,9 @@ Every update request consists of zero or more prerequisites and zero or more updates. This allows a suitably authenticated update request to proceed if some specified resource records are present or missing from the zone. -A blank input line causes the accumulated commands to be sent as one Dynamic -DNS update request to the name server. +A blank input line (or the <command>send</command> command) causes the +accumulated commands to be sent as one Dynamic DNS update request to the +name server. </para> <para> The command formats and their meaning are as follows: @@ -401,6 +402,27 @@ Adds a new resource record with the specified and <parameter>data</parameter>. </para> + +<varlistentry><term> +<cmdsynopsis> +<command>show</command> +</cmdsynopsis> +</term> +<listitem> +<para> +Displays the current message, containing all of the prerequisites and +updates specified since the last send. +</para> + +<varlistentry><term> +<cmdsynopsis> +<command>send</command> +</cmdsynopsis> +</term> +<listitem> +<para> +Sends the current message. This is equivalent to entering a blank line. +</para> </listitem> </variablelist> diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html index 367f5acf..5fcc5733 100644 --- a/bin/nsupdate/nsupdate.html +++ b/bin/nsupdate/nsupdate.html @@ -311,8 +311,12 @@ Updates will be rejected if the tests for the prerequisite conditions fail.</P and zero or more updates. This allows a suitably authenticated update request to proceed if some specified resource records are present or missing from the zone. -A blank input line causes the accumulated commands to be sent as one Dynamic -DNS update request to the name server.</P +A blank input line (or the <B +CLASS="COMMAND" +>send</B +> command) causes the +accumulated commands to be sent as one Dynamic DNS update request to the +name server.</P ><P >The command formats and their meaning are as follows: <P @@ -716,6 +720,29 @@ CLASS="PARAMETER" ></TT >.</P ></DD +><DT +><P +><B +CLASS="COMMAND" +>show</B +> </P +></DT +><DD +><P +>Displays the current message, containing all of the prerequisites and +updates specified since the last send.</P +></DD +><DT +><P +><B +CLASS="COMMAND" +>send</B +> </P +></DT +><DD +><P +>Sends the current message. This is equivalent to entering a blank line.</P +></DD ></DL ></DIV > </P @@ -725,7 +752,7 @@ CLASS="PARAMETER" ><DIV CLASS="REFSECT1" ><A -NAME="AEN210" +NAME="AEN223" ></A ><H2 >EXAMPLES</H2 @@ -796,7 +823,7 @@ SIG, KEY and NXT records.)</P ><DIV CLASS="REFSECT1" ><A -NAME="AEN223" +NAME="AEN236" ></A ><H2 >FILES</H2 @@ -852,7 +879,7 @@ CLASS="REFENTRYTITLE" ><DIV CLASS="REFSECT1" ><A -NAME="AEN247" +NAME="AEN260" ></A ><H2 >SEE ALSO</H2 @@ -917,7 +944,7 @@ CLASS="REFENTRYTITLE" ><DIV CLASS="REFSECT1" ><A -NAME="AEN268" +NAME="AEN281" ></A ><H2 >BUGS</H2 diff --git a/bin/rndc/util.c b/bin/rndc/util.c index 98d52e5e..8529260a 100644 --- a/bin/rndc/util.c +++ b/bin/rndc/util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: util.c,v 1.1 2001/06/22 17:22:26 tale Exp $ */ +/* $Id: util.c,v 1.2 2001/07/17 20:29:18 gson Exp $ */ #include <config.h> diff --git a/bin/rndc/util.h b/bin/rndc/util.h index 40aa59a3..5ad58e15 100644 --- a/bin/rndc/util.h +++ b/bin/rndc/util.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: util.h,v 1.3 2001/07/02 00:06:22 bwelling Exp $ */ +/* $Id: util.h,v 1.4 2001/07/17 20:29:19 gson Exp $ */ #ifndef RNDC_UTIL_H #define RNDC_UTIL_H 1 diff --git a/bin/tests/system/tkey/prereq.sh b/bin/tests/system/tkey/prereq.sh index 0811968e..285e2805 100644 --- a/bin/tests/system/tkey/prereq.sh +++ b/bin/tests/system/tkey/prereq.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2000, 2001 Internet Software Consortium. +# Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3 2001/07/13 18:29:00 gson Exp $ +# $Id: prereq.sh,v 1.4 2001/07/17 20:29:20 gson Exp $ if $KEYGEN -a RSA -b 512 -n zone -r $KEYGEN foo > /dev/null 2>&1 then diff --git a/config.h.in b/config.h.in index 6eac211b..777e7e8f 100644 --- a/config.h.in +++ b/config.h.in @@ -16,7 +16,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.h.in,v 1.43 2001/07/04 00:34:41 bwelling Exp $ */ +/* $Id: config.h.in,v 1.44 2001/07/14 01:55:05 gson Exp $ */ /*** *** This file is not to be included by any public header files, because @@ -95,9 +95,6 @@ /* define if getc_unlocked() is available */ #undef HAVE_GETCUNLOCKED -/* define if rlim_t is defined via sys/types.h or sys/resource.h */ -#undef HAVE_RLIM_T - /* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ #undef SHUTUP_SPUTAUX #ifdef SHUTUP_SPUTAUX @@ -15,7 +15,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# From configure.in Revision: 1.275 +# From configure.in Revision: 1.282 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- ## Copyright 1996, 1997, 1998, 1999, 2000, 2001 @@ -382,6 +382,8 @@ ac_help="$ac_help --enable-ipv6 use IPv6 [default=autodetect]" ac_help="$ac_help --with-kame[=PATH] use Kame IPv6 [default path /usr/local/v6]" +ac_help="$ac_help + --disable-linux-caps disable linux capabilities" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -924,7 +926,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:928: checking host system type" >&5 +echo "configure:930: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -946,7 +948,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:950: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:952: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -975,7 +977,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:979: checking for $ac_word" >&5 +echo "configure:981: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1014,7 +1016,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1018: checking for a BSD compatible install" >&5 +echo "configure:1020: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1075,7 +1077,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1079: checking for $ac_word" >&5 +echo "configure:1081: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1134,7 +1136,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:1138: checking for $ac_word" >&5 +echo "configure:1140: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ETAGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1176,7 +1178,7 @@ done # if test "X$ETAGS" != "X"; then echo $ac_n "checking for Exuberant Ctags etags""... $ac_c" 1>&6 -echo "configure:1180: checking for Exuberant Ctags etags" >&5 +echo "configure:1182: checking for Exuberant Ctags etags" >&5 if $ETAGS --version 2>&1 | grep 'Exuberant Ctags' >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 ETAGS="$ETAGS -L" @@ -1194,7 +1196,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:1198: checking for $ac_word" >&5 +echo "configure:1200: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1341,7 +1343,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1345: checking for $ac_word" >&5 +echo "configure:1347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1371,7 +1373,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1375: checking for $ac_word" >&5 +echo "configure:1377: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1422,7 +1424,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1426: checking for $ac_word" >&5 +echo "configure:1428: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1454,7 +1456,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1458: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1460: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1465,12 +1467,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1469 "configure" +#line 1471 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1496,12 +1498,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1500: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1502: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1505: checking whether we are using GNU C" >&5 +echo "configure:1507: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1510,7 +1512,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1529,7 +1531,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1533: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1535: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1562,7 +1564,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1566: checking how to run the C preprocessor" >&5 +echo "configure:1568: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1577,13 +1579,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1581 "configure" +#line 1583 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1589: \"$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 : @@ -1594,13 +1596,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1598 "configure" +#line 1600 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1606: \"$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 : @@ -1611,13 +1613,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1615 "configure" +#line 1617 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1623: \"$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 : @@ -1642,12 +1644,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1646: checking for ANSI C header files" >&5 +echo "configure:1648: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1651 "configure" +#line 1653 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1655,7 +1657,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1661: \"$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* @@ -1672,7 +1674,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1676 "configure" +#line 1678 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1690,7 +1692,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1694 "configure" +#line 1696 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1711,7 +1713,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1715 "configure" +#line 1717 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1722,7 +1724,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1750,17 +1752,17 @@ for ac_hdr in fcntl.h sys/time.h unistd.h sys/sockio.h sys/select.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1754: checking for $ac_hdr" >&5 +echo "configure:1756: 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 -#line 1759 "configure" +#line 1761 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1766: \"$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* @@ -1788,12 +1790,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1792: checking for working const" >&5 +echo "configure:1794: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1797 "configure" +#line 1799 "configure" #include "confdefs.h" int main() { @@ -1842,7 +1844,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:1846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1863,21 +1865,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1867: checking for inline" >&5 +echo "configure:1869: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 1874 "configure" +#line 1876 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1908,9 +1910,9 @@ esac # is reported to not support "static inline" (RT #1212). # echo $ac_n "checking for static inline breakage""... $ac_c" 1>&6 -echo "configure:1912: checking for static inline breakage" >&5 +echo "configure:1914: checking for static inline breakage" >&5 cat > conftest.$ac_ext <<EOF -#line 1914 "configure" +#line 1916 "configure" #include "confdefs.h" int main() { @@ -1927,7 +1929,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -1943,12 +1945,12 @@ fi rm -f conftest* echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1947: checking for size_t" >&5 +echo "configure:1949: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1952 "configure" +#line 1954 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1976,12 +1978,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1980: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1982: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1985 "configure" +#line 1987 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1990,7 +1992,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2011,16 +2013,16 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:2015: checking for long long" >&5 +echo "configure:2017: checking for long long" >&5 cat > conftest.$ac_ext <<EOF -#line 2017 "configure" +#line 2019 "configure" #include "confdefs.h" int main() { long long i = 0; return (0); ; return 0; } EOF -if { (eval echo configure:2024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_HAVELONGLONG="#define ISC_PLATFORM_HAVELONGLONG 1" @@ -2040,9 +2042,9 @@ rm -f conftest* case $ac_cv_header_unistd_h in yes) echo $ac_n "checking if unistd.h defines fd_set""... $ac_c" 1>&6 -echo "configure:2044: checking if unistd.h defines fd_set" >&5 +echo "configure:2046: checking if unistd.h defines fd_set" >&5 cat > conftest.$ac_ext <<EOF -#line 2046 "configure" +#line 2048 "configure" #include "confdefs.h" #include <unistd.h> @@ -2050,7 +2052,7 @@ int main() { fd_set read_set; return (0); ; return 0; } EOF -if { (eval echo configure:2054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDSYSSELECTH="#undef ISC_PLATFORM_NEEDSYSSELECTH" @@ -2092,14 +2094,14 @@ esac # Find the machine's endian flavor. # echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2096: checking whether byte ordering is bigendian" >&5 +echo "configure:2098: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2103 "configure" +#line 2105 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2110,11 +2112,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2118 "configure" +#line 2120 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2125,7 +2127,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2145,7 +2147,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 <<EOF -#line 2149 "configure" +#line 2151 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2158,7 +2160,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2186,7 +2188,7 @@ fi # was --with-openssl specified? # echo $ac_n "checking for OpenSSL library""... $ac_c" 1>&6 -echo "configure:2190: checking for OpenSSL library" >&5 +echo "configure:2192: checking for OpenSSL library" >&5 # Check whether --with-openssl or --without-openssl was given. if test "${with_openssl+set}" = set; then withval="$with_openssl" @@ -2206,7 +2208,7 @@ case "$use_openssl" in if test "$use_openssl" = "yes" then # User did not specify a path - guess it - openssldirs="/usr /usr/local /usr/pkg" + openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg" for d in $openssldirs do if test -f $d/include/openssl/opensslv.h @@ -2227,16 +2229,16 @@ case "$use_openssl" in echo "$ac_t""using openssl from $use_openssl/lib and $use_openssl/include" 1>&6 echo $ac_n "checking OpenSSL library version""... $ac_c" 1>&6 -echo "configure:2231: checking OpenSSL library version" >&5 +echo "configure:2233: checking OpenSSL library version" >&5 saved_cflags="$CFLAGS" saved_libs="$LIBS" CFLAGS="$CFLAGS $DST_OPENSSL_INC" LIBS="$LIBS $DNS_OPENSSL_LIBS" if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + echo "$ac_t""assuming target platform has compatible version" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2240 "configure" +#line 2242 "configure" #include "confdefs.h" #include <openssl/opensslv.h> @@ -2247,7 +2249,7 @@ int main() { } EOF -if { (eval echo configure:2251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""ok" 1>&6 else @@ -2255,7 +2257,7 @@ else cat conftest.$ac_ext >&5 rm -fr conftest* echo "$ac_t""not compatible" 1>&6 - { echo "configure: error: you need OpenSSL 0.9.5a or newer" 1>&2; exit 1; } + { echo "configure: error: you need OpenSSL 0.9.5a or newer" 1>&2; exit 1; } fi rm -fr conftest* fi @@ -2312,7 +2314,7 @@ DNS_GSSAPI_LIBS='' # was --with-randomdev specified? # echo $ac_n "checking for random device""... $ac_c" 1>&6 -echo "configure:2316: checking for random device" >&5 +echo "configure:2318: checking for random device" >&5 # Check whether --with-randomdev or --without-randomdev was given. if test "${with_randomdev+set}" = set; then withval="$with_randomdev" @@ -2335,7 +2337,7 @@ case "$use_randomdev" in ac_safe=`echo "$devrandom" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $devrandom""... $ac_c" 1>&6 -echo "configure:2339: checking for $devrandom" >&5 +echo "configure:2341: checking for $devrandom" >&5 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2387,7 +2389,7 @@ esac # echo $ac_n "checking whether to build with thread support""... $ac_c" 1>&6 -echo "configure:2391: checking whether to build with thread support" >&5 +echo "configure:2393: checking whether to build with thread support" >&5 case $host in *-dec-osf*) @@ -2400,7 +2402,9 @@ case $host in use_threads=true ;; *-ibm-aix*) use_threads=true ;; -*-hp-hpux*) +*-hp-hpux10*) + use_threads=false ;; +*-hp-hpux11*) use_threads=true ;; *-sgi-irix*) use_threads=true ;; @@ -2473,7 +2477,7 @@ then # experiment with it. CC="gcc" echo $ac_n "checking which NetBSD thread library to use""... $ac_c" 1>&6 -echo "configure:2477: checking which NetBSD thread library to use" >&5 +echo "configure:2481: checking which NetBSD thread library to use" >&5 # Check whether --with-ptl2 or --without-ptl2 was given. if test "${with_ptl2+set}" = set; then @@ -2512,7 +2516,7 @@ fi ;; *) echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:2516: checking for pthread_create in -lpthread" >&5 +echo "configure:2520: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2520,7 +2524,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 2524 "configure" +#line 2528 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2531,7 +2535,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:2535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2557,7 +2561,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:2561: checking for __pthread_create in -lpthread" >&5 +echo "configure:2565: checking for __pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'__pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2565,7 +2569,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 2569 "configure" +#line 2573 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2576,7 +2580,7 @@ int main() { __pthread_create() ; return 0; } EOF -if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2602,7 +2606,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __pthread_create_system in -lpthread""... $ac_c" 1>&6 -echo "configure:2606: checking for __pthread_create_system in -lpthread" >&5 +echo "configure:2610: checking for __pthread_create_system in -lpthread" >&5 ac_lib_var=`echo pthread'_'__pthread_create_system | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2610,7 +2614,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 2614 "configure" +#line 2618 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2621,7 +2625,7 @@ int main() { __pthread_create_system() ; return 0; } EOF -if { (eval echo configure:2625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2647,7 +2651,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:2651: checking for pthread_create in -lc_r" >&5 +echo "configure:2655: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2655,7 +2659,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 2659 "configure" +#line 2663 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2666,7 +2670,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:2670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2692,7 +2696,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:2696: checking for pthread_create in -lc" >&5 +echo "configure:2700: checking for pthread_create in -lc" >&5 ac_lib_var=`echo c'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2700,7 +2704,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2704 "configure" +#line 2708 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2711,7 +2715,7 @@ int main() { pthread_create() ; return 0; } EOF -if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2757,7 +2761,7 @@ then # We'd like to use sigwait() too # echo $ac_n "checking for sigwait in -lc""... $ac_c" 1>&6 -echo "configure:2761: checking for sigwait in -lc" >&5 +echo "configure:2765: checking for sigwait in -lc" >&5 ac_lib_var=`echo c'_'sigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2765,7 +2769,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 2769 "configure" +#line 2773 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2776,7 +2780,7 @@ int main() { sigwait() ; return 0; } EOF -if { (eval echo configure:2780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2798,7 +2802,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sigwait in -lpthread""... $ac_c" 1>&6 -echo "configure:2802: checking for sigwait in -lpthread" >&5 +echo "configure:2806: checking for sigwait in -lpthread" >&5 ac_lib_var=`echo pthread'_'sigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2806,7 +2810,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 2810 "configure" +#line 2814 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2817,7 +2821,7 @@ int main() { sigwait() ; return 0; } EOF -if { (eval echo configure:2821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2839,7 +2843,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _Psigwait in -lpthread""... $ac_c" 1>&6 -echo "configure:2843: checking for _Psigwait in -lpthread" >&5 +echo "configure:2847: checking for _Psigwait in -lpthread" >&5 ac_lib_var=`echo pthread'_'_Psigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2847,7 +2851,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 2851 "configure" +#line 2855 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2858,7 +2862,7 @@ int main() { _Psigwait() ; return 0; } EOF -if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2888,12 +2892,12 @@ fi echo $ac_n "checking for pthread_attr_getstacksize""... $ac_c" 1>&6 -echo "configure:2892: checking for pthread_attr_getstacksize" >&5 +echo "configure:2896: checking for pthread_attr_getstacksize" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getstacksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2897 "configure" +#line 2901 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_attr_getstacksize(); below. */ @@ -2916,7 +2920,7 @@ pthread_attr_getstacksize(); ; return 0; } EOF -if { (eval echo configure:2920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_attr_getstacksize=yes" else @@ -2948,7 +2952,7 @@ fi # *-freebsd*) echo $ac_n "checking for sigwait in -lc_r""... $ac_c" 1>&6 -echo "configure:2952: checking for sigwait in -lc_r" >&5 +echo "configure:2956: checking for sigwait in -lc_r" >&5 ac_lib_var=`echo c_r'_'sigwait | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2956,7 +2960,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 2960 "configure" +#line 2964 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2967,7 +2971,7 @@ int main() { sigwait() ; return 0; } EOF -if { (eval echo configure:2971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3022,12 +3026,12 @@ EOF EOF echo $ac_n "checking for pthread_setconcurrency""... $ac_c" 1>&6 -echo "configure:3026: checking for pthread_setconcurrency" >&5 +echo "configure:3030: checking for pthread_setconcurrency" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_setconcurrency'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3031 "configure" +#line 3035 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pthread_setconcurrency(); below. */ @@ -3050,7 +3054,7 @@ pthread_setconcurrency(); ; return 0; } EOF -if { (eval echo configure:3054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_setconcurrency=yes" else @@ -3088,12 +3092,12 @@ EOF # Look for sysconf to allow detection of the number of processors. # echo $ac_n "checking for sysconf""... $ac_c" 1>&6 -echo "configure:3092: checking for sysconf" >&5 +echo "configure:3096: checking for sysconf" >&5 if eval "test \"`echo '$''{'ac_cv_func_sysconf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3097 "configure" +#line 3101 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sysconf(); below. */ @@ -3116,7 +3120,7 @@ sysconf(); ; return 0; } EOF -if { (eval echo configure:3120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sysconf=yes" else @@ -3197,12 +3201,12 @@ ISC_THREAD_DIR=$thread_dir # be defined. # echo $ac_n "checking for flockfile""... $ac_c" 1>&6 -echo "configure:3201: checking for flockfile" >&5 +echo "configure:3205: checking for flockfile" >&5 if eval "test \"`echo '$''{'ac_cv_func_flockfile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3206 "configure" +#line 3210 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char flockfile(); below. */ @@ -3225,7 +3229,7 @@ flockfile(); ; return 0; } EOF -if { (eval echo configure:3229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_flockfile=yes" else @@ -3248,12 +3252,12 @@ else fi echo $ac_n "checking for getc_unlocked""... $ac_c" 1>&6 -echo "configure:3252: checking for getc_unlocked" >&5 +echo "configure:3256: checking for getc_unlocked" >&5 if eval "test \"`echo '$''{'ac_cv_func_getc_unlocked'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3257 "configure" +#line 3261 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getc_unlocked(); below. */ @@ -3276,7 +3280,7 @@ getc_unlocked(); ; return 0; } EOF -if { (eval echo configure:3280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getc_unlocked=yes" else @@ -3303,7 +3307,7 @@ fi # Indicate what the final decision was regarding threads. # echo $ac_n "checking whether to build with threads""... $ac_c" 1>&6 -echo "configure:3307: checking whether to build with threads" >&5 +echo "configure:3311: checking whether to build with threads" >&5 if $use_threads; then echo "$ac_t""yes" 1>&6 else @@ -3379,12 +3383,12 @@ fi # NLS # echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3383: checking for catgets" >&5 +echo "configure:3387: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3388 "configure" +#line 3392 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char catgets(); below. */ @@ -3407,7 +3411,7 @@ catgets(); ; return 0; } EOF -if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3445,7 +3449,7 @@ case "$host" in ;; *) echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:3449: checking for socket in -lsocket" >&5 +echo "configure:3453: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3453,7 +3457,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 3457 "configure" +#line 3461 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3464,7 +3468,7 @@ int main() { socket() ; return 0; } EOF -if { (eval echo configure:3468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3492,7 +3496,7 @@ else fi echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 -echo "configure:3496: checking for inet_ntoa in -lnsl" >&5 +echo "configure:3500: checking for inet_ntoa in -lnsl" >&5 ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3500,7 +3504,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3504 "configure" +#line 3508 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3511,7 +3515,7 @@ int main() { inet_ntoa() ; return 0; } EOF -if { (eval echo configure:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3545,7 +3549,7 @@ esac # Purify support # echo $ac_n "checking whether to use purify""... $ac_c" 1>&6 -echo "configure:3549: checking whether to use purify" >&5 +echo "configure:3553: checking whether to use purify" >&5 # Check whether --with-purify or --without-purify was given. if test "${with_purify+set}" = set; then withval="$with_purify" @@ -3562,7 +3566,7 @@ case "$use_purify" in # Extract the first word of "purify", so it can be a program name with args. set dummy purify; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3566: checking for $ac_word" >&5 +echo "configure:3570: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_purify_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3639,12 +3643,12 @@ fi case $use_libtool in yes) echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:3643: checking for Cygwin environment" >&5 +echo "configure:3647: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3648 "configure" +#line 3652 "configure" #include "confdefs.h" int main() { @@ -3655,7 +3659,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -3672,19 +3676,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:3676: checking for mingw32 environment" >&5 +echo "configure:3680: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3681 "configure" +#line 3685 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:3688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -3770,7 +3774,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:3774: checking build system type" >&5 +echo "configure:3778: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -3799,7 +3803,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:3803: checking for ld used by GCC" >&5 +echo "configure:3807: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -3829,10 +3833,10 @@ echo "configure:3803: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:3833: checking for GNU ld" >&5 +echo "configure:3837: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:3836: checking for non-GNU ld" >&5 +echo "configure:3840: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3867,7 +3871,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:3871: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:3875: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3884,7 +3888,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:3888: checking for $LD option to reload object files" >&5 +echo "configure:3892: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3896,7 +3900,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:3900: checking for BSD-compatible nm" >&5 +echo "configure:3904: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3934,7 +3938,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3938: checking whether ln -s works" >&5 +echo "configure:3942: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3955,7 +3959,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:3959: checking how to recognise dependant libraries" >&5 +echo "configure:3963: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4128,13 +4132,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:4132: checking for object suffix" >&5 +echo "configure:4136: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:4138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -4154,7 +4158,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:4158: checking for executable suffix" >&5 +echo "configure:4162: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4164,7 +4168,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:4168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:4172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -4195,7 +4199,7 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6 -echo "configure:4199: checking command to parse $NM output" >&5 +echo "configure:4203: checking command to parse $NM output" >&5 if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4271,10 +4275,10 @@ void nm_test_func(){} int main(){nm_test_var='a';nm_test_func();return(0);} EOF - if { (eval echo configure:4275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then # Now try to grab the symbols. nlist=conftest.nm - if { (eval echo configure:4278: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + if { (eval echo configure:4282: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4325,7 +4329,7 @@ EOF save_CFLAGS="$CFLAGS" LIBS="conftstm.$ac_objext" CFLAGS="$CFLAGS$no_builtin_flag" - if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + if { (eval echo configure:4333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then pipe_works=yes fi LIBS="$save_LIBS" @@ -4371,17 +4375,17 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4375: checking for $ac_hdr" >&5 +echo "configure:4379: 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 -#line 4380 "configure" +#line 4384 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4389: \"$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* @@ -4416,7 +4420,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:4420: checking for ${ac_tool_prefix}file" >&5 +echo "configure:4424: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4478,7 +4482,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:4482: checking for file" >&5 +echo "configure:4486: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4549,7 +4553,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4553: checking for $ac_word" >&5 +echo "configure:4557: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4581,7 +4585,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4585: checking for $ac_word" >&5 +echo "configure:4589: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4616,7 +4620,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4620: checking for $ac_word" >&5 +echo "configure:4624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4648,7 +4652,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4652: checking for $ac_word" >&5 +echo "configure:4656: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4697,8 +4701,8 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4701 "configure"' > conftest.$ac_ext - if { (eval echo configure:4702: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 4705 "configure"' > conftest.$ac_ext + if { (eval echo configure:4706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -4719,7 +4723,7 @@ case $host in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:4723: checking whether the C compiler needs -belf" >&5 +echo "configure:4727: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4732,14 +4736,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 4736 "configure" +#line 4740 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -4854,7 +4858,7 @@ compiler="$2" ## FIXME: this should be a separate macro ## echo $ac_n "checking for objdir""... $ac_c" 1>&6 -echo "configure:4858: checking for objdir" >&5 +echo "configure:4862: checking for objdir" >&5 rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -4885,7 +4889,7 @@ test -z "$pic_mode" && pic_mode=default # in isolation, and that seeing it set (from the cache) indicates that # the associated values are set (in the cache) correctly too. echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 -echo "configure:4889: checking for $compiler option to produce PIC" >&5 +echo "configure:4893: checking for $compiler option to produce PIC" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5037,21 +5041,21 @@ else # Check to make sure the pic_flag actually works. echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6 -echo "configure:5041: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 +echo "configure:5045: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat > conftest.$ac_ext <<EOF -#line 5048 "configure" +#line 5052 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* case $host_os in hpux9* | hpux10* | hpux11*) @@ -5107,7 +5111,7 @@ fi ## FIXME: this should be a separate macro ## echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6 -echo "configure:5111: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 +echo "configure:5115: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5 if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5115,14 +5119,14 @@ else save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat > conftest.$ac_ext <<EOF -#line 5119 "configure" +#line 5123 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:5126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_prog_cc_static_works=yes else @@ -5153,7 +5157,7 @@ can_build_shared="$lt_cv_prog_cc_can_build_shared" ## # Check to see if options -o and -c are simultaneously supported by compiler echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 -echo "configure:5157: checking if $compiler supports -c -o file.$ac_objext" >&5 +echo "configure:5161: checking if $compiler supports -c -o file.$ac_objext" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5172,7 +5176,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:5176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:5180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -5201,7 +5205,7 @@ echo "$ac_t""$compiler_c_o" 1>&6 if test x"$compiler_c_o" = x"yes"; then # Check to see if we can write to a .lo echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6 -echo "configure:5205: checking if $compiler supports -c -o file.lo" >&5 +echo "configure:5209: checking if $compiler supports -c -o file.lo" >&5 if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5210,14 +5214,14 @@ else save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -c -o conftest.lo" cat > conftest.$ac_ext <<EOF -#line 5214 "configure" +#line 5218 "configure" #include "confdefs.h" int main() { int some_variable = 0; ; return 0; } EOF -if { (eval echo configure:5221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5251,7 +5255,7 @@ hard_links="nottested" if test "$compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 -echo "configure:5255: checking if we can lock with hard links" >&5 +echo "configure:5259: checking if we can lock with hard links" >&5 hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no @@ -5274,20 +5278,20 @@ fi if test "$GCC" = yes; then # Check to see if options -fno-rtti -fno-exceptions are supported by compiler echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 -echo "configure:5278: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +echo "configure:5282: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 echo "int some_variable = 0;" > conftest.$ac_ext save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext" compiler_rtti_exceptions=no cat > conftest.$ac_ext <<EOF -#line 5284 "configure" +#line 5288 "configure" #include "confdefs.h" int main() { int some_variable = 0; ; return 0; } EOF -if { (eval echo configure:5291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -5318,7 +5322,7 @@ fi ## # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6 -echo "configure:5322: checking whether the linker ($LD) supports shared libraries" >&5 +echo "configure:5326: checking whether the linker ($LD) supports shared libraries" >&5 allow_undefined_flag= no_undefined_flag= @@ -5938,7 +5942,7 @@ test "$ld_shlibs" = no && can_build_shared=no ## # Check hardcoding attributes. echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 -echo "configure:5942: checking how to hardcode library paths into programs" >&5 +echo "configure:5946: checking how to hardcode library paths into programs" >&5 hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var"; then @@ -5970,7 +5974,7 @@ echo "$ac_t""$hardcode_action" 1>&6 striplib= old_striplib= echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 -echo "configure:5974: checking whether stripping libraries is possible" >&5 +echo "configure:5978: checking whether stripping libraries is possible" >&5 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" @@ -5988,7 +5992,7 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown ## # PORTME Fill in your ld.so characteristics echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 -echo "configure:5992: checking dynamic linker characteristics" >&5 +echo "configure:5996: checking dynamic linker characteristics" >&5 library_names_spec= libname_spec='lib$name' soname_spec= @@ -6378,7 +6382,7 @@ test "$dynamic_linker" = no && can_build_shared=no ## # Report the final consequences. echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 -echo "configure:6382: checking if libtool supports shared libraries" >&5 +echo "configure:6386: checking if libtool supports shared libraries" >&5 echo "$ac_t""$can_build_shared" 1>&6 ## ## END FIXME @@ -6419,7 +6423,7 @@ else *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:6423: checking for dlopen in -ldl" >&5 +echo "configure:6427: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6427,7 +6431,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 6431 "configure" +#line 6435 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6438,7 +6442,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:6442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6457,12 +6461,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:6461: checking for dlopen" >&5 +echo "configure:6465: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6466 "configure" +#line 6470 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -6485,7 +6489,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:6489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -6503,12 +6507,12 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load""... $ac_c" 1>&6 -echo "configure:6507: checking for shl_load" >&5 +echo "configure:6511: checking for shl_load" >&5 if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6512 "configure" +#line 6516 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shl_load(); below. */ @@ -6531,7 +6535,7 @@ shl_load(); ; return 0; } EOF -if { (eval echo configure:6535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shl_load=yes" else @@ -6549,7 +6553,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 -echo "configure:6553: checking for dlopen in -lsvld" >&5 +echo "configure:6557: checking for dlopen in -lsvld" >&5 ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6557,7 +6561,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsvld $LIBS" cat > conftest.$ac_ext <<EOF -#line 6561 "configure" +#line 6565 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6568,7 +6572,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6587,7 +6591,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:6591: checking for shl_load in -ldld" >&5 +echo "configure:6595: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6595,7 +6599,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 6599 "configure" +#line 6603 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6606,7 +6610,7 @@ int main() { shl_load() ; return 0; } EOF -if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6659,7 +6663,7 @@ fi LIBS="$lt_cv_dlopen_libs $LIBS" echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 -echo "configure:6663: checking whether a program can dlopen itself" >&5 +echo "configure:6667: checking whether a program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6669,7 +6673,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 6673 "configure" +#line 6677 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -6730,7 +6734,7 @@ int main () exit (status); } EOF - if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:6738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -6753,7 +6757,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 if test "x$lt_cv_dlopen_self" = xyes; then LDFLAGS="$LDFLAGS $link_static_flag" echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 -echo "configure:6757: checking whether a statically linked program can dlopen itself" >&5 +echo "configure:6761: checking whether a statically linked program can dlopen itself" >&5 if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6763,7 +6767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 6767 "configure" +#line 6771 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -6824,7 +6828,7 @@ int main () exit (status); } EOF - if { (eval echo configure:6828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) 2>/dev/null lt_status=$? case x$lt_status in @@ -6875,14 +6879,14 @@ if test "$enable_shared" = yes && test "$GCC" = yes; then # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 -echo "configure:6879: checking whether -lc should be explicitly linked in" >&5 +echo "configure:6883: checking whether -lc should be explicitly linked in" >&5 if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else $rm conftest* echo 'static int dummy;' > conftest.$ac_ext - if { (eval echo configure:6886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:6890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then soname=conftest lib=conftest libobjs=conftest.$ac_objext @@ -6895,7 +6899,7 @@ else libname=conftest save_allow_undefined_flag=$allow_undefined_flag allow_undefined_flag= - if { (eval echo configure:6899: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + if { (eval echo configure:6903: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } then lt_cv_archive_cmds_need_lc=no else @@ -7552,9 +7556,9 @@ esac # the right suffix on the files. # echo $ac_n "checking for IPv6 structures""... $ac_c" 1>&6 -echo "configure:7556: checking for IPv6 structures" >&5 +echo "configure:7560: checking for IPv6 structures" >&5 cat > conftest.$ac_ext <<EOF -#line 7558 "configure" +#line 7562 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7564,7 +7568,7 @@ int main() { struct sockaddr_in6 sin6; return (0); ; return 0; } EOF -if { (eval echo configure:7568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 found_ipv6=yes @@ -7582,7 +7586,7 @@ rm -f conftest* # This is done before other IPv6 linking tests to LIBS is properly set. # echo $ac_n "checking for Kame IPv6 support""... $ac_c" 1>&6 -echo "configure:7586: checking for Kame IPv6 support" >&5 +echo "configure:7590: checking for Kame IPv6 support" >&5 # Check whether --with-kame or --without-kame was given. if test "${with_kame+set}" = set; then withval="$with_kame" @@ -7673,9 +7677,9 @@ case "$found_ipv6" in LWRES_PLATFORM_HAVEIPV6="#define LWRES_PLATFORM_HAVEIPV6 1" echo $ac_n "checking for in6_addr""... $ac_c" 1>&6 -echo "configure:7677: checking for in6_addr" >&5 +echo "configure:7681: checking for in6_addr" >&5 cat > conftest.$ac_ext <<EOF -#line 7679 "configure" +#line 7683 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7688,7 +7692,7 @@ int main() { struct in6_addr in6; return (0); ; return 0; } EOF -if { (eval echo configure:7692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_HAVEINADDR6="#undef ISC_PLATFORM_HAVEINADDR6" @@ -7706,9 +7710,9 @@ fi rm -f conftest* echo $ac_n "checking for in6addr_any""... $ac_c" 1>&6 -echo "configure:7710: checking for in6addr_any" >&5 +echo "configure:7714: checking for in6addr_any" >&5 cat > conftest.$ac_ext <<EOF -#line 7712 "configure" +#line 7716 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7722,7 +7726,7 @@ int main() { struct in6_addr in6; in6 = in6addr_any; return (0); ; return 0; } EOF -if { (eval echo configure:7726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7730: \"$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_NEEDIN6ADDRANY="#undef ISC_PLATFORM_NEEDIN6ADDRANY" @@ -7738,9 +7742,9 @@ fi rm -f conftest* echo $ac_n "checking for sin6_scope_id in struct sockaddr_in6""... $ac_c" 1>&6 -echo "configure:7742: checking for sin6_scope_id in struct sockaddr_in6" >&5 +echo "configure:7746: checking for sin6_scope_id in struct sockaddr_in6" >&5 cat > conftest.$ac_ext <<EOF -#line 7744 "configure" +#line 7748 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7753,7 +7757,7 @@ int main() { struct sockaddr_in6 xyzzy; xyzzy.sin6_scope_id = 0; return (0); ; return 0; } EOF -if { (eval echo configure:7757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 result="#define LWRES_HAVE_SIN6_SCOPE_ID 1" @@ -7768,9 +7772,9 @@ rm -f conftest* LWRES_HAVE_SIN6_SCOPE_ID="$result" echo $ac_n "checking for in6_pktinfo""... $ac_c" 1>&6 -echo "configure:7772: checking for in6_pktinfo" >&5 +echo "configure:7776: checking for in6_pktinfo" >&5 cat > conftest.$ac_ext <<EOF -#line 7774 "configure" +#line 7778 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7783,7 +7787,7 @@ int main() { struct in6_pktinfo xyzzy; return (0); ; return 0; } EOF -if { (eval echo configure:7787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_HAVEIN6PKTINFO="#define ISC_PLATFORM_HAVEIN6PKTINFO 1" @@ -7836,9 +7840,9 @@ esac # echo $ac_n "checking for inet_ntop""... $ac_c" 1>&6 -echo "configure:7840: checking for inet_ntop" >&5 +echo "configure:7844: checking for inet_ntop" >&5 cat > conftest.$ac_ext <<EOF -#line 7842 "configure" +#line 7846 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7848,7 +7852,7 @@ int main() { inet_ntop(0, 0, 0, 0); return (0); ; return 0; } EOF -if { (eval echo configure:7852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7856: \"$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" @@ -7865,24 +7869,27 @@ rm -f conftest* # On NetBSD 1.4.2 and maybe others, inet_pton() incorrectly accepts -# addresses with less than four octets, like "1.2.3". +# addresses with less than four octets, like "1.2.3". Also leading +# zeros should also be rejected. echo $ac_n "checking for inet_pton""... $ac_c" 1>&6 -echo "configure:7872: checking for inet_pton" >&5 +echo "configure:7877: checking for inet_pton" >&5 if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + echo "$ac_t""assuming target platform has working inet_pton" 1>&6 + ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON" else cat > conftest.$ac_ext <<EOF -#line 7877 "configure" +#line 7883 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -main() { char a[4]; return (inet_pton(AF_INET, "1.2.3", a) == 0 ? 0 : 1); } +main() { char a[4]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : + inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 : 0); } EOF -if { (eval echo configure:7886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON" @@ -7900,9 +7907,9 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:7904: checking for inet_aton" >&5 +echo "configure:7911: checking for inet_aton" >&5 cat > conftest.$ac_ext <<EOF -#line 7906 "configure" +#line 7913 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7912,7 +7919,7 @@ int main() { struct in_addr in; inet_aton(0, &in); return (0); ; return 0; } EOF -if { (eval echo configure:7916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7923: \"$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" @@ -7945,9 +7952,9 @@ EOF esac echo $ac_n "checking for sa_len in struct sockaddr""... $ac_c" 1>&6 -echo "configure:7949: checking for sa_len in struct sockaddr" >&5 +echo "configure:7956: checking for sa_len in struct sockaddr" >&5 cat > conftest.$ac_ext <<EOF -#line 7951 "configure" +#line 7958 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7956,7 +7963,7 @@ int main() { struct sockaddr sa; sa.sa_len = 0; return (0); ; return 0; } EOF -if { (eval echo configure:7960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_PLATFORM_HAVESALEN="#define ISC_PLATFORM_HAVESALEN 1" @@ -7977,9 +7984,9 @@ rm -f conftest* # Look for a 4.4BSD or 4.3BSD struct msghdr # echo $ac_n "checking for struct msghdr flavor""... $ac_c" 1>&6 -echo "configure:7981: checking for struct msghdr flavor" >&5 +echo "configure:7988: checking for struct msghdr flavor" >&5 cat > conftest.$ac_ext <<EOF -#line 7983 "configure" +#line 7990 "configure" #include "confdefs.h" #include <sys/types.h> @@ -7988,7 +7995,7 @@ int main() { struct msghdr msg; msg.msg_flags = 0; return (0); ; return 0; } EOF -if { (eval echo configure:7992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7999: \"$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" @@ -8006,9 +8013,9 @@ rm -f conftest* # Look for in_port_t. # echo $ac_n "checking for type in_port_t""... $ac_c" 1>&6 -echo "configure:8010: checking for type in_port_t" >&5 +echo "configure:8017: checking for type in_port_t" >&5 cat > conftest.$ac_ext <<EOF -#line 8012 "configure" +#line 8019 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8017,7 +8024,7 @@ int main() { in_port_t port = 25; return (0); ; return 0; } EOF -if { (eval echo configure:8021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8028: \"$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" @@ -8035,9 +8042,9 @@ rm -f conftest* # Check for addrinfo # echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6 -echo "configure:8039: checking for struct addrinfo" >&5 +echo "configure:8046: checking for struct addrinfo" >&5 cat > conftest.$ac_ext <<EOF -#line 8041 "configure" +#line 8048 "configure" #include "confdefs.h" #include <netdb.h> @@ -8045,7 +8052,7 @@ int main() { struct addrinfo a; return (0); ; return 0; } EOF -if { (eval echo configure:8049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8056: \"$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" @@ -8064,9 +8071,9 @@ rm -f conftest* echo $ac_n "checking for int sethostent""... $ac_c" 1>&6 -echo "configure:8068: checking for int sethostent" >&5 +echo "configure:8075: checking for int sethostent" >&5 cat > conftest.$ac_ext <<EOF -#line 8070 "configure" +#line 8077 "configure" #include "confdefs.h" #include <netdb.h> @@ -8074,7 +8081,7 @@ int main() { int i = sethostent(0); return(0); ; return 0; } EOF -if { (eval echo configure:8078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8085: \"$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" @@ -8089,9 +8096,9 @@ rm -f conftest* echo $ac_n "checking for int endhostent""... $ac_c" 1>&6 -echo "configure:8093: checking for int endhostent" >&5 +echo "configure:8100: checking for int endhostent" >&5 cat > conftest.$ac_ext <<EOF -#line 8095 "configure" +#line 8102 "configure" #include "confdefs.h" #include <netdb.h> @@ -8099,7 +8106,7 @@ int main() { int i = endhostent(); return(0); ; return 0; } EOF -if { (eval echo configure:8103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8110: \"$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" @@ -8114,9 +8121,9 @@ rm -f conftest* echo $ac_n "checking for getnetbyaddr(in_addr_t, ...)""... $ac_c" 1>&6 -echo "configure:8118: checking for getnetbyaddr(in_addr_t, ...)" >&5 +echo "configure:8125: checking for getnetbyaddr(in_addr_t, ...)" >&5 cat > conftest.$ac_ext <<EOF -#line 8120 "configure" +#line 8127 "configure" #include "confdefs.h" #include <netdb.h> @@ -8125,7 +8132,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 ISC_LWRES_GETNETBYADDRINADDR="#define ISC_LWRES_GETNETBYADDRINADDR 1" @@ -8140,9 +8147,9 @@ rm -f conftest* echo $ac_n "checking for int setnetent""... $ac_c" 1>&6 -echo "configure:8144: checking for int setnetent" >&5 +echo "configure:8151: checking for int setnetent" >&5 cat > conftest.$ac_ext <<EOF -#line 8146 "configure" +#line 8153 "configure" #include "confdefs.h" #include <netdb.h> @@ -8150,7 +8157,7 @@ int main() { int i = setnetent(0); return(0); ; return 0; } EOF -if { (eval echo configure:8154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8161: \"$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" @@ -8165,9 +8172,9 @@ rm -f conftest* echo $ac_n "checking for int endnetent""... $ac_c" 1>&6 -echo "configure:8169: checking for int endnetent" >&5 +echo "configure:8176: checking for int endnetent" >&5 cat > conftest.$ac_ext <<EOF -#line 8171 "configure" +#line 8178 "configure" #include "confdefs.h" #include <netdb.h> @@ -8175,7 +8182,7 @@ int main() { int i = endnetent(); return(0); ; return 0; } EOF -if { (eval echo configure:8179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8186: \"$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" @@ -8190,9 +8197,9 @@ rm -f conftest* echo $ac_n "checking for gethostbyaddr(const void *, size_t, ...)""... $ac_c" 1>&6 -echo "configure:8194: checking for gethostbyaddr(const void *, size_t, ...)" >&5 +echo "configure:8201: checking for gethostbyaddr(const void *, size_t, ...)" >&5 cat > conftest.$ac_ext <<EOF -#line 8196 "configure" +#line 8203 "configure" #include "confdefs.h" #include <netdb.h> @@ -8201,7 +8208,7 @@ int main() { return(0); ; return 0; } EOF -if { (eval echo configure:8205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8212: \"$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" @@ -8216,9 +8223,9 @@ rm -f conftest* echo $ac_n "checking for h_errno in netdb.h""... $ac_c" 1>&6 -echo "configure:8220: checking for h_errno in netdb.h" >&5 +echo "configure:8227: checking for h_errno in netdb.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8222 "configure" +#line 8229 "configure" #include "confdefs.h" #include <netdb.h> @@ -8226,7 +8233,7 @@ int main() { h_errno = 1; return(0); ; return 0; } EOF -if { (eval echo configure:8230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8237: \"$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" @@ -8241,12 +8248,12 @@ rm -f conftest* echo $ac_n "checking for getipnodebyname""... $ac_c" 1>&6 -echo "configure:8245: checking for getipnodebyname" >&5 +echo "configure:8252: 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 <<EOF -#line 8250 "configure" +#line 8257 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getipnodebyname(); below. */ @@ -8269,7 +8276,7 @@ getipnodebyname(); ; return 0; } EOF -if { (eval echo configure:8273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8280: \"$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 @@ -8290,12 +8297,12 @@ ISC_LWRES_GETIPNODEPROTO="#define ISC_LWRES_GETIPNODEPROTO 1" fi echo $ac_n "checking for getnameinfo""... $ac_c" 1>&6 -echo "configure:8294: checking for getnameinfo" >&5 +echo "configure:8301: 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 <<EOF -#line 8299 "configure" +#line 8306 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getnameinfo(); below. */ @@ -8318,7 +8325,7 @@ getnameinfo(); ; return 0; } EOF -if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8329: \"$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 @@ -8339,12 +8346,12 @@ ISC_LWRES_GETNAMEINFOPROTO="#define ISC_LWRES_GETNAMEINFOPROTO 1" fi echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:8343: checking for getaddrinfo" >&5 +echo "configure:8350: 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 <<EOF -#line 8348 "configure" +#line 8355 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getaddrinfo(); below. */ @@ -8367,7 +8374,7 @@ getaddrinfo(); ; return 0; } EOF -if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8378: \"$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 @@ -8392,12 +8399,12 @@ ISC_LWRES_GETADDRINFOPROTO="#define ISC_LWRES_GETADDRINFOPROTO 1" fi echo $ac_n "checking for gai_strerror""... $ac_c" 1>&6 -echo "configure:8396: checking for gai_strerror" >&5 +echo "configure:8403: 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 <<EOF -#line 8401 "configure" +#line 8408 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gai_strerror(); below. */ @@ -8420,7 +8427,7 @@ gai_strerror(); ; return 0; } EOF -if { (eval echo configure:8424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8431: \"$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 @@ -8450,9 +8457,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:8454: checking for interface list sysctl" >&5 +echo "configure:8461: checking for interface list sysctl" >&5 cat > conftest.$ac_ext <<EOF -#line 8456 "configure" +#line 8463 "configure" #include "confdefs.h" #include <sys/param.h> @@ -8482,12 +8489,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:8486: checking for strsep" >&5 +echo "configure:8493: 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 <<EOF -#line 8491 "configure" +#line 8498 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strsep(); below. */ @@ -8510,7 +8517,7 @@ strsep(); ; return 0; } EOF -if { (eval echo configure:8514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8521: \"$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 @@ -8531,12 +8538,12 @@ ISC_PLATFORM_NEEDSTRSEP="#define ISC_PLATFORM_NEEDSTRSEP 1" fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:8535: checking for vsnprintf" >&5 +echo "configure:8542: 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 <<EOF -#line 8540 "configure" +#line 8547 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -8559,7 +8566,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:8563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8570: \"$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 @@ -8595,17 +8602,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:8599: checking printf format modifier for 64-bit integers" >&5 +echo "configure:8606: checking printf format modifier for 64-bit integers" >&5 if test "$cross_compiling" = yes; then - echo "$ac_t""default ll" 1>&6 + echo "$ac_t""assuming target platform uses ll" 1>&6 ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"' else cat > conftest.$ac_ext <<EOF -#line 8605 "configure" +#line 8612 "configure" #include "confdefs.h" main() { exit(!(sizeof(long long int) == sizeof(long int))); } EOF -if { (eval echo configure:8609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8616: \"$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"' @@ -8625,12 +8632,12 @@ fi # Security Stuff # echo $ac_n "checking for chroot""... $ac_c" 1>&6 -echo "configure:8629: checking for chroot" >&5 +echo "configure:8636: 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 <<EOF -#line 8634 "configure" +#line 8641 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char chroot(); below. */ @@ -8653,7 +8660,7 @@ chroot(); ; return 0; } EOF -if { (eval echo configure:8657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8664: \"$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 @@ -8675,21 +8682,29 @@ else echo "$ac_t""no" 1>&6 fi -for ac_hdr in linux/capability.h +# Check whether --enable-linux-caps or --disable-linux-caps was given. +if test "${enable_linux_caps+set}" = set; then + enableval="$enable_linux_caps" + : +fi + +case "$enable_linux_caps" in + yes|'') + 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:8683: checking for $ac_hdr" >&5 +echo "configure:8698: 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 -#line 8688 "configure" +#line 8703 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8708: \"$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* @@ -8715,21 +8730,25 @@ else fi done + ;; + no) + ;; +esac 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:8723: checking for $ac_hdr" >&5 +echo "configure:8742: 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 -#line 8728 "configure" +#line 8747 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8752: \"$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* @@ -8760,9 +8779,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:8764: checking for type rlim_t" >&5 +echo "configure:8783: checking for type rlim_t" >&5 cat > conftest.$ac_ext <<EOF -#line 8766 "configure" +#line 8785 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8772,27 +8791,23 @@ int main() { rlim_t rl = 19671212; return (0); ; return 0; } EOF -if { (eval echo configure:8776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_RLIM_T 1 -EOF - + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE rlim_t" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 -fi -rm -f conftest* -echo $ac_n "checking sizeof rlim_cur""... $ac_c" 1>&6 -echo "configure:8791: checking sizeof rlim_cur" >&5 + +echo $ac_n "checking type of rlim_cur""... $ac_c" 1>&6 +echo "configure:8806: checking type of rlim_cur" >&5 if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { echo "configure: error: cannot determine type of rlim_cur when cross compiling - define rlim_t" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 8796 "configure" +#line 8811 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8800,7 +8815,7 @@ else #include <sys/resource.h> main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} EOF -if { (eval echo configure:8804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8819: \"$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" @@ -8810,10 +8825,10 @@ else rm -fr conftest* if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { echo "configure: error: this cannot happen" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 8817 "configure" +#line 8832 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8821,7 +8836,7 @@ else #include <sys/resource.h> main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} EOF -if { (eval echo configure:8825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8840: \"$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" @@ -8831,10 +8846,10 @@ else rm -fr conftest* if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { echo "configure: error: this cannot happen" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 8838 "configure" +#line 8853 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8842,7 +8857,7 @@ else #include <sys/resource.h> main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} EOF -if { (eval echo configure:8846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8861: \"$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" @@ -8867,6 +8882,9 @@ rm -fr conftest* fi +fi +rm -f conftest* + # # Microsoft has their own way of handling shared libraries that requires @@ -8961,7 +8979,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:8965: checking for $ac_word" >&5 +echo "configure:8983: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OPENJADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9008,7 +9026,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:9012: checking for $ac_word" >&5 +echo "configure:9030: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JADETEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9051,7 +9069,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:9055: checking for $ac_word" >&5 +echo "configure:9073: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PDFJADETEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9107,7 +9125,7 @@ test -n "$PDFJADETEX" || PDFJADETEX="pdfjadetex" SGMLCATALOG="" echo $ac_n "checking for catalog""... $ac_c" 1>&6 -echo "configure:9111: checking for catalog" >&5 +echo "configure:9129: checking for catalog" >&5 for d in $sgmltrees do f=$d/catalog @@ -9149,7 +9167,7 @@ done HTMLSTYLE="" echo $ac_n "checking for html/docbook.dsl""... $ac_c" 1>&6 -echo "configure:9153: checking for html/docbook.dsl" >&5 +echo "configure:9171: checking for html/docbook.dsl" >&5 for d in $stylepath do f=$d/html/docbook.dsl @@ -9170,7 +9188,7 @@ fi PRINTSTYLE="" echo $ac_n "checking for print/docbook.dsl""... $ac_c" 1>&6 -echo "configure:9174: checking for print/docbook.dsl" >&5 +echo "configure:9192: checking for print/docbook.dsl" >&5 for d in $stylepath do f=$d/print/docbook.dsl @@ -9196,7 +9214,7 @@ fi XMLDCL="" echo $ac_n "checking for docbook/dsssl/modular/dtds/decls/xml.dcl""... $ac_c" 1>&6 -echo "configure:9200: checking for docbook/dsssl/modular/dtds/decls/xml.dcl" >&5 +echo "configure:9218: checking for docbook/dsssl/modular/dtds/decls/xml.dcl" >&5 for d in $sgmltrees do f=$d/docbook/dsssl/modular/dtds/decls/xml.dcl @@ -9222,7 +9240,7 @@ fi DOCBOOK2MANSPEC="" echo $ac_n "checking for docbook2X/docbook2man-spec.pl""... $ac_c" 1>&6 -echo "configure:9226: checking for docbook2X/docbook2man-spec.pl" >&5 +echo "configure:9244: checking for docbook2X/docbook2man-spec.pl" >&5 for d in $sgmltrees do f=$d/docbook2X/docbook2man-spec.pl diff --git a/configure.in b/configure.in index 826439a3..2a7395f0 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -e# Copyright (C) 1998-2001 Internet Software Consortium. +# Copyright (C) 1998-2001 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.275 $) +AC_REVISION($Revision: 1.282 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -292,7 +292,7 @@ case "$use_openssl" in if test "$use_openssl" = "yes" then # User did not specify a path - guess it - openssldirs="/usr /usr/local /usr/pkg" + openssldirs="/usr /usr/local /usr/local/ssl /usr/pkg" for d in $openssldirs do if test -f $d/include/openssl/opensslv.h @@ -328,7 +328,8 @@ int main() { ], [AC_MSG_RESULT(ok)], [AC_MSG_RESULT(not compatible) - AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)]) + AC_MSG_ERROR(you need OpenSSL 0.9.5a or newer)], + [AC_MSG_RESULT(assuming target platform has compatible version)]) CFLAGS="$saved_cflags" LIBS="$saved_libs" ;; @@ -434,7 +435,9 @@ case $host in use_threads=true ;; *-ibm-aix*) use_threads=true ;; -*-hp-hpux*) +*-hp-hpux10*) + use_threads=false ;; +*-hp-hpux11*) use_threads=true ;; *-sgi-irix*) use_threads=true ;; @@ -1101,7 +1104,8 @@ AC_TRY_LINK([ # On NetBSD 1.4.2 and maybe others, inet_pton() incorrectly accepts -# addresses with less than four octets, like "1.2.3". +# addresses with less than four octets, like "1.2.3". Also leading +# zeros should also be rejected. AC_MSG_CHECKING([for inet_pton]) AC_TRY_RUN([ @@ -1109,13 +1113,16 @@ AC_TRY_RUN([ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -main() { char a[4]; return (inet_pton(AF_INET, "1.2.3", a) == 0 ? 0 : 1); }], +main() { char a[4]; return (inet_pton(AF_INET, "1.2.3", a) == 1 ? 1 : + inet_pton(AF_INET, "1.2.3.04", a) == 1 ? 1 : 0); }], [AC_MSG_RESULT(yes) ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"], [AC_MSG_RESULT(no) ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_pton.$O" ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_pton.c" - ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1"]) + ISC_PLATFORM_NEEDPTON="#define ISC_PLATFORM_NEEDPTON 1"], + [AC_MSG_RESULT(assuming target platform has working inet_pton) + ISC_PLATFORM_NEEDPTON="#undef ISC_PLATFORM_NEEDPTON"]) AC_MSG_CHECKING([for inet_aton]) AC_TRY_LINK([ @@ -1334,7 +1341,7 @@ AC_TRY_RUN([main() { exit(!(sizeof(long long int) == sizeof(long int))); }], ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "l"'], [AC_MSG_RESULT(ll) ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"'], - [AC_MSG_RESULT(default ll) + [AC_MSG_RESULT(assuming target platform uses ll) ISC_PLATFORM_QUADFORMAT='#define ISC_PLATFORM_QUADFORMAT "ll"']) AC_SUBST(ISC_PLATFORM_QUADFORMAT) @@ -1342,7 +1349,15 @@ AC_SUBST(ISC_PLATFORM_QUADFORMAT) # Security Stuff # AC_CHECK_FUNC(chroot, AC_DEFINE(HAVE_CHROOT)) -AC_CHECK_HEADERS(linux/capability.h) +AC_ARG_ENABLE(linux-caps, + [ --disable-linux-caps disable linux capabilities]) +case "$enable_linux_caps" in + yes|'') + AC_CHECK_HEADERS(linux/capability.h) + ;; + no) + ;; +esac AC_CHECK_HEADERS(sys/prctl.h) # @@ -1354,10 +1369,11 @@ AC_TRY_COMPILE([ #include <sys/time.h> #include <sys/resource.h>], [rlim_t rl = 19671212; return (0);], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_RLIM_T)], - [AC_MSG_RESULT(no)]) -AC_MSG_CHECKING(sizeof rlim_cur) +[AC_MSG_RESULT(yes) + ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE rlim_t"], +[AC_MSG_RESULT(no) + +AC_MSG_CHECKING(type of rlim_cur) AC_TRY_RUN([ #include <sys/types.h> #include <sys/time.h> @@ -1382,9 +1398,10 @@ main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} [AC_MSG_RESULT(long long int) ISC_PLATFORM_RLIMITTYPE="#define ISC_PLATFORM_RLIMITTYPE long long int"], [AC_MSG_ERROR([unable to determine sizeof rlim_cur]) -],[]) -],[]) -],[]) +],[AC_MSG_ERROR(this cannot happen)]) +],[AC_MSG_ERROR(this cannot happen)]) +],[AC_MSG_ERROR(cannot determine type of rlim_cur when cross compiling - define rlim_t)]) +]) AC_SUBST(ISC_PLATFORM_RLIMITTYPE) # diff --git a/doc/misc/dnssec b/doc/misc/dnssec index 145e298b..39721604 100644 --- a/doc/misc/dnssec +++ b/doc/misc/dnssec @@ -1,4 +1,3 @@ - Copyright (C) 2000, 2001 Internet Software Consortium. See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. @@ -81,4 +80,4 @@ an update occurs. Advanced access control is possible using the "update-policy" statement in the zone definition. -$Id: dnssec,v 1.13 2001/07/13 00:48:46 gson Exp $ +$Id: dnssec,v 1.14 2001/07/17 20:29:22 gson Exp $ diff --git a/lib/bind/configure b/lib/bind/configure index 704fa17b..ef7474b9 100755 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Revision: 1.65 +# From configure.in Revision: 1.74 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- ## Copyright 1996, 1997, 1998, 1999, 2000, 2001 @@ -7992,7 +7992,7 @@ esac # PORT_INCLUDE -PORT_INCLUDE= +PORT_INCLUDE=port/unknown/include SOLARIS_BITTYPES="#undef NEED_SOLARIS_BITTYPES" BSD_COMP="#undef BSD_COMP" USE_FIONBIO_IOCTL="#undef USE_FIONBIO_IOCTL" @@ -8030,6 +8030,9 @@ case "$host" in *-solaris2*) BSD_COMP="#define BSD_COMP 1" PORT_INCLUDE="port/solaris/include";; *-ultrix*) PORT_INCLUDE="port/ultrix/include";; + *-sco-sysv*uw2.0*) PORT_INCLUDE="port/unixware20/include";; + *-sco-sysv*uw2.1.2*) PORT_INCLUDE="port/unixware212/include";; + *-sco-sysv*uw7*) PORT_INCLUDE="port/unixware7/include";; esac @@ -8041,9 +8044,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:8045: checking for struct msghdr flavor" >&5 +echo "configure:8048: checking for struct msghdr flavor" >&5 cat > conftest.$ac_ext <<EOF -#line 8047 "configure" +#line 8050 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8052,7 +8055,7 @@ int main() { struct msghdr msg; msg.msg_flags = 0; return (0); ; return 0; } EOF -if { (eval echo configure:8056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8059: \"$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" @@ -8070,9 +8073,9 @@ rm -f conftest* # Look for in_port_t. # echo $ac_n "checking for type in_port_t""... $ac_c" 1>&6 -echo "configure:8074: checking for type in_port_t" >&5 +echo "configure:8077: checking for type in_port_t" >&5 cat > conftest.$ac_ext <<EOF -#line 8076 "configure" +#line 8079 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8081,7 +8084,7 @@ int main() { in_port_t port = 25; return (0); ; return 0; } EOF -if { (eval echo configure:8085: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8088: \"$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" @@ -8099,9 +8102,9 @@ rm -f conftest* # Check for addrinfo # echo $ac_n "checking for struct addrinfo""... $ac_c" 1>&6 -echo "configure:8103: checking for struct addrinfo" >&5 +echo "configure:8106: checking for struct addrinfo" >&5 cat > conftest.$ac_ext <<EOF -#line 8105 "configure" +#line 8108 "configure" #include "confdefs.h" #include <netdb.h> @@ -8109,7 +8112,7 @@ int main() { struct addrinfo a; return (0); ; return 0; } EOF -if { (eval echo configure:8113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -8125,9 +8128,9 @@ fi rm -f conftest* echo $ac_n "checking for int sethostent""... $ac_c" 1>&6 -echo "configure:8129: checking for int sethostent" >&5 +echo "configure:8132: checking for int sethostent" >&5 cat > conftest.$ac_ext <<EOF -#line 8131 "configure" +#line 8134 "configure" #include "confdefs.h" #include <netdb.h> @@ -8135,7 +8138,7 @@ int main() { int i = sethostent(0); return(0); ; return 0; } EOF -if { (eval echo configure:8139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -8147,9 +8150,9 @@ fi rm -f conftest* echo $ac_n "checking for int endhostent""... $ac_c" 1>&6 -echo "configure:8151: checking for int endhostent" >&5 +echo "configure:8154: checking for int endhostent" >&5 cat > conftest.$ac_ext <<EOF -#line 8153 "configure" +#line 8156 "configure" #include "confdefs.h" #include <netdb.h> @@ -8157,7 +8160,7 @@ int main() { int i = endhostent(); return(0); ; return 0; } EOF -if { (eval echo configure:8161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8164: \"$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" @@ -8176,9 +8179,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:8180: checking for getnetbyaddr(in_addr_t, ...)" >&5 +echo "configure:8183: checking for getnetbyaddr(in_addr_t, ...)" >&5 cat > conftest.$ac_ext <<EOF -#line 8182 "configure" +#line 8185 "configure" #include "confdefs.h" #include <netdb.h> @@ -8187,7 +8190,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8194: \"$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" @@ -8203,9 +8206,9 @@ esac echo $ac_n "checking for int setnetent""... $ac_c" 1>&6 -echo "configure:8207: checking for int setnetent" >&5 +echo "configure:8210: checking for int setnetent" >&5 cat > conftest.$ac_ext <<EOF -#line 8209 "configure" +#line 8212 "configure" #include "confdefs.h" #include <netdb.h> @@ -8213,7 +8216,7 @@ int main() { int i = setnetent(0); return(0); ; return 0; } EOF -if { (eval echo configure:8217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8220: \"$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" @@ -8228,9 +8231,9 @@ rm -f conftest* echo $ac_n "checking for int endnetent""... $ac_c" 1>&6 -echo "configure:8232: checking for int endnetent" >&5 +echo "configure:8235: checking for int endnetent" >&5 cat > conftest.$ac_ext <<EOF -#line 8234 "configure" +#line 8237 "configure" #include "confdefs.h" #include <netdb.h> @@ -8238,7 +8241,7 @@ int main() { int i = endnetent(); return(0); ; return 0; } EOF -if { (eval echo configure:8242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8245: \"$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" @@ -8253,9 +8256,9 @@ rm -f conftest* echo $ac_n "checking for gethostbyaddr(const void *, size_t, ...)""... $ac_c" 1>&6 -echo "configure:8257: checking for gethostbyaddr(const void *, size_t, ...)" >&5 +echo "configure:8260: checking for gethostbyaddr(const void *, size_t, ...)" >&5 cat > conftest.$ac_ext <<EOF -#line 8259 "configure" +#line 8262 "configure" #include "confdefs.h" #include <netdb.h> @@ -8264,7 +8267,7 @@ int main() { return(0); ; return 0; } EOF -if { (eval echo configure:8268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8271: \"$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" @@ -8279,9 +8282,9 @@ rm -f conftest* echo $ac_n "checking for h_errno in netdb.h""... $ac_c" 1>&6 -echo "configure:8283: checking for h_errno in netdb.h" >&5 +echo "configure:8286: checking for h_errno in netdb.h" >&5 cat > conftest.$ac_ext <<EOF -#line 8285 "configure" +#line 8288 "configure" #include "confdefs.h" #include <netdb.h> @@ -8289,7 +8292,7 @@ int main() { h_errno = 1; return(0); ; return 0; } EOF -if { (eval echo configure:8293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8296: \"$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" @@ -8304,12 +8307,12 @@ rm -f conftest* echo $ac_n "checking for getipnodebyname""... $ac_c" 1>&6 -echo "configure:8308: checking for getipnodebyname" >&5 +echo "configure:8311: 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 <<EOF -#line 8313 "configure" +#line 8316 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getipnodebyname(); below. */ @@ -8332,7 +8335,7 @@ getipnodebyname(); ; return 0; } EOF -if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8339: \"$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 @@ -8353,12 +8356,12 @@ ISC_LWRES_GETIPNODEPROTO="#define ISC_LWRES_GETIPNODEPROTO 1" fi echo $ac_n "checking for getnameinfo""... $ac_c" 1>&6 -echo "configure:8357: checking for getnameinfo" >&5 +echo "configure:8360: 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 <<EOF -#line 8362 "configure" +#line 8365 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getnameinfo(); below. */ @@ -8381,7 +8384,7 @@ getnameinfo(); ; return 0; } EOF -if { (eval echo configure:8385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8388: \"$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 @@ -8402,12 +8405,12 @@ ISC_LWRES_GETNAMEINFOPROTO="#define ISC_LWRES_GETNAMEINFOPROTO 1" fi echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:8406: checking for getaddrinfo" >&5 +echo "configure:8409: 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 <<EOF -#line 8411 "configure" +#line 8414 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getaddrinfo(); below. */ @@ -8430,7 +8433,7 @@ getaddrinfo(); ; return 0; } EOF -if { (eval echo configure:8434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8437: \"$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 @@ -8455,12 +8458,12 @@ ISC_LWRES_GETADDRINFOPROTO="#define ISC_LWRES_GETADDRINFOPROTO 1" fi echo $ac_n "checking for gai_strerror""... $ac_c" 1>&6 -echo "configure:8459: checking for gai_strerror" >&5 +echo "configure:8462: 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 <<EOF -#line 8464 "configure" +#line 8467 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gai_strerror(); below. */ @@ -8483,7 +8486,7 @@ gai_strerror(); ; return 0; } EOF -if { (eval echo configure:8487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8490: \"$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 @@ -8509,12 +8512,12 @@ fi echo $ac_n "checking for pselect""... $ac_c" 1>&6 -echo "configure:8513: checking for pselect" >&5 +echo "configure:8516: 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 <<EOF -#line 8518 "configure" +#line 8521 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pselect(); below. */ @@ -8537,7 +8540,7 @@ pselect(); ; return 0; } EOF -if { (eval echo configure:8541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8544: \"$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 @@ -8559,12 +8562,12 @@ fi echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6 -echo "configure:8563: checking for gettimeofday" >&5 +echo "configure:8566: checking for gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettimeofday'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8568 "configure" +#line 8571 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gettimeofday(); below. */ @@ -8587,7 +8590,7 @@ gettimeofday(); ; return 0; } EOF -if { (eval echo configure:8591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gettimeofday=yes" else @@ -8609,12 +8612,12 @@ fi echo $ac_n "checking for strndup""... $ac_c" 1>&6 -echo "configure:8613: checking for strndup" >&5 +echo "configure:8616: checking for strndup" >&5 if eval "test \"`echo '$''{'ac_cv_func_strndup'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8618 "configure" +#line 8621 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strndup(); below. */ @@ -8637,7 +8640,7 @@ strndup(); ; return 0; } EOF -if { (eval echo configure:8641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strndup=yes" else @@ -8663,9 +8666,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:8667: checking for interface list sysctl" >&5 +echo "configure:8670: checking for interface list sysctl" >&5 cat > conftest.$ac_ext <<EOF -#line 8669 "configure" +#line 8672 "configure" #include "confdefs.h" #include <sys/param.h> @@ -8695,12 +8698,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:8699: checking for strsep" >&5 +echo "configure:8702: 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 <<EOF -#line 8704 "configure" +#line 8707 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strsep(); below. */ @@ -8723,7 +8726,7 @@ strsep(); ; return 0; } EOF -if { (eval echo configure:8727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8730: \"$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 @@ -8744,12 +8747,12 @@ ISC_PLATFORM_NEEDSTRSEP="#define ISC_PLATFORM_NEEDSTRSEP 1" fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:8748: checking for vsnprintf" >&5 +echo "configure:8751: 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 <<EOF -#line 8753 "configure" +#line 8756 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -8772,7 +8775,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:8776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8779: \"$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 @@ -8808,17 +8811,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:8812: checking printf format modifier for 64-bit integers" >&5 +echo "configure:8815: 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 <<EOF -#line 8818 "configure" +#line 8821 "configure" #include "confdefs.h" main() { exit(!(sizeof(long long int) == sizeof(long int))); } EOF -if { (eval echo configure:8822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8825: \"$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"' @@ -8838,12 +8841,12 @@ fi # Security Stuff # echo $ac_n "checking for chroot""... $ac_c" 1>&6 -echo "configure:8842: checking for chroot" >&5 +echo "configure:8845: 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 <<EOF -#line 8847 "configure" +#line 8850 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char chroot(); below. */ @@ -8866,7 +8869,7 @@ chroot(); ; return 0; } EOF -if { (eval echo configure:8870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8873: \"$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 @@ -8888,94 +8891,14 @@ else echo "$ac_t""no" 1>&6 fi -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:8896: 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 -#line 8901 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8906: \"$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* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - -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:8936: 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 -#line 8941 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8946: \"$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* - eval "ac_cv_header_$ac_safe=yes" -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF - -else - echo "$ac_t""no" 1>&6 -fi -done - # # for accept, recvfrom, getpeername etc. # echo $ac_n "checking for socket length type""... $ac_c" 1>&6 -echo "configure:8977: checking for socket length type" >&5 +echo "configure:8900: checking for socket length type" >&5 cat > conftest.$ac_ext <<EOF -#line 8979 "configure" +#line 8902 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8986,7 +8909,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ISC_SOCKLEN_T="#define ISC_SOCKLEN_T socklen_t" @@ -8995,7 +8918,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 8999 "configure" +#line 8922 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9006,7 +8929,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ISC_SOCKLEN_T="#define ISC_SOCKLEN_T unsigned int" @@ -9015,7 +8938,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9019 "configure" +#line 8942 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9026,7 +8949,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ISC_SOCKLEN_T="#define ISC_SOCKLEN_T unsigned long" @@ -9035,7 +8958,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9039 "configure" +#line 8962 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9046,7 +8969,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ISC_SOCKLEN_T="#define ISC_SOCKLEN_T long" @@ -9070,9 +8993,9 @@ rm -f conftest* # 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:9074: checking for type rlim_t" >&5 +echo "configure:8997: checking for type rlim_t" >&5 cat > conftest.$ac_ext <<EOF -#line 9076 "configure" +#line 8999 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9082,7 +9005,7 @@ int main() { rlim_t rl = 19671212; return (0); ; return 0; } EOF -if { (eval echo configure:9086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -9097,12 +9020,12 @@ else fi rm -f conftest* echo $ac_n "checking sizeof rlim_cur""... $ac_c" 1>&6 -echo "configure:9101: checking sizeof rlim_cur" >&5 +echo "configure:9024: 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 <<EOF -#line 9106 "configure" +#line 9029 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9110,7 +9033,7 @@ else #include <sys/resource.h> main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(int)));} EOF -if { (eval echo configure:9114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9037: \"$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" @@ -9123,7 +9046,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 <<EOF -#line 9127 "configure" +#line 9050 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9131,7 +9054,7 @@ else #include <sys/resource.h> main() { struct rlimit r; exit(!(sizeof(r.rlim_cur) == sizeof(long int)));} EOF -if { (eval echo configure:9135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9058: \"$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" @@ -9144,7 +9067,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 <<EOF -#line 9148 "configure" +#line 9071 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9152,7 +9075,7 @@ else #include <sys/resource.h> main() { struct rlimit r; exit((!sizeof(r.rlim_cur) == sizeof(long long int)));} EOF -if { (eval echo configure:9156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9079: \"$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" @@ -9179,12 +9102,12 @@ fi echo $ac_n "checking for getgrouplist""... $ac_c" 1>&6 -echo "configure:9183: checking for getgrouplist" >&5 +echo "configure:9106: 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 <<EOF -#line 9188 "configure" +#line 9111 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getgrouplist(); below. */ @@ -9207,7 +9130,7 @@ getgrouplist(); ; return 0; } EOF -if { (eval echo configure:9211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9134: \"$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 @@ -9222,7 +9145,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getgrouplist`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 9226 "configure" +#line 9149 "configure" #include "confdefs.h" #include <unistd.h> int @@ -9233,7 +9156,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:9237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9160: \"$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" @@ -9258,12 +9181,12 @@ fi echo $ac_n "checking for setgroupent""... $ac_c" 1>&6 -echo "configure:9262: checking for setgroupent" >&5 +echo "configure:9185: 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 <<EOF -#line 9267 "configure" +#line 9190 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setgroupent(); below. */ @@ -9286,7 +9209,7 @@ setgroupent(); ; return 0; } EOF -if { (eval echo configure:9290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9213: \"$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 @@ -9311,12 +9234,12 @@ fi echo $ac_n "checking for getnetbyaddr_r""... $ac_c" 1>&6 -echo "configure:9315: checking for getnetbyaddr_r" >&5 +echo "configure:9238: 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 <<EOF -#line 9320 "configure" +#line 9243 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getnetbyaddr_r(); below. */ @@ -9339,7 +9262,7 @@ getnetbyaddr_r(); ; return 0; } EOF -if { (eval echo configure:9343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9266: \"$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 @@ -9354,7 +9277,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getnetbyaddr_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 9358 "configure" +#line 9281 "configure" #include "confdefs.h" #include <netdb.h> struct netent * @@ -9365,7 +9288,7 @@ int main() { return (0) ; return 0; } EOF -if { (eval echo configure:9369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NET_R_ARGS="#define NET_R_ARGS char *buf, int buflen" @@ -9373,11 +9296,41 @@ NET_R_BAD="#define NET_R_BAD NULL" NET_R_COPY="#define NET_R_COPY buf, buflen" NET_R_COPY_ARGS="#define NET_R_COPY_ARGS NET_R_ARGS" NET_R_OK="#define NET_R_OK nptr" +NET_R_SETANSWER="#undef NET_R_SETANSWER" NET_R_RETURN="#define NET_R_RETURN struct netent *" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext <<EOF +#line 9308 "configure" +#include "confdefs.h" +#include <netdb.h> +int getnetbyaddr_r (unsigned long int, int, struct netent *, + char *, size_t, struct netent **, int *); + +int main() { +return (0) +; return 0; } +EOF +if { (eval echo configure:9318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + +NET_R_ARGS="#define NET_R_ARGS char *buf, size_t buflen, struct netent **answerp, int *h_errnop" +NET_R_BAD="#define NET_R_BAD ERANGE" +NET_R_COPY="#define NET_R_COPY buf, buflen" +NET_R_COPY_ARGS="#define NET_R_COPY_ARGS char *buf, size_t buflen" +NET_R_OK="#define NET_R_OK 0" +NET_R_SETANSWER="#define NET_R_SETANSWER 1" +NET_R_RETURN="#define NET_R_RETURN int" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + fi rm -f conftest* @@ -9388,6 +9341,7 @@ NET_R_BAD="#define NET_R_BAD NULL" NET_R_COPY="#define NET_R_COPY buf, buflen" NET_R_COPY_ARGS="#define NET_R_COPY_ARGS NET_R_ARGS" NET_R_OK="#define NET_R_OK nptr" +NET_R_SETANSWER="#undef NET_R_SETANSWER" NET_R_RETURN="#define NET_R_RETURN struct netent *" fi @@ -9399,13 +9353,14 @@ fi + echo $ac_n "checking for setnetent_r""... $ac_c" 1>&6 -echo "configure:9404: checking for setnetent_r" >&5 +echo "configure:9359: 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 <<EOF -#line 9409 "configure" +#line 9364 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setnetent_r(); below. */ @@ -9428,7 +9383,7 @@ setnetent_r(); ; return 0; } EOF -if { (eval echo configure:9432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9387: \"$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 @@ -9456,12 +9411,12 @@ fi echo $ac_n "checking for endnetent_r""... $ac_c" 1>&6 -echo "configure:9460: checking for endnetent_r" >&5 +echo "configure:9415: 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 <<EOF -#line 9465 "configure" +#line 9420 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char endnetent_r(); below. */ @@ -9484,7 +9439,7 @@ endnetent_r(); ; return 0; } EOF -if { (eval echo configure:9488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9443: \"$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 @@ -9510,12 +9465,12 @@ fi echo $ac_n "checking for getgrnam_r""... $ac_c" 1>&6 -echo "configure:9514: checking for getgrnam_r" >&5 +echo "configure:9469: 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 <<EOF -#line 9519 "configure" +#line 9474 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getgrnam_r(); below. */ @@ -9538,7 +9493,7 @@ getgrnam_r(); ; return 0; } EOF -if { (eval echo configure:9542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9497: \"$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 @@ -9562,12 +9517,12 @@ EOF fi echo $ac_n "checking for getgrgid_r""... $ac_c" 1>&6 -echo "configure:9566: checking for getgrgid_r" >&5 +echo "configure:9521: 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 <<EOF -#line 9571 "configure" +#line 9526 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getgrgid_r(); below. */ @@ -9590,7 +9545,7 @@ getgrgid_r(); ; return 0; } EOF -if { (eval echo configure:9594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9549: \"$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 @@ -9615,12 +9570,12 @@ fi echo $ac_n "checking for getgrent_r""... $ac_c" 1>&6 -echo "configure:9619: checking for getgrent_r" >&5 +echo "configure:9574: 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 <<EOF -#line 9624 "configure" +#line 9579 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getgrent_r(); below. */ @@ -9643,7 +9598,7 @@ getgrent_r(); ; return 0; } EOF -if { (eval echo configure:9647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9602: \"$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 @@ -9658,7 +9613,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getgrent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 9662 "configure" +#line 9617 "configure" #include "confdefs.h" #include <grp.h> @@ -9669,7 +9624,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:9673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* GROUP_R_ARGS="#define GROUP_R_ARGS char *buf, int buflen" @@ -9702,12 +9657,12 @@ fi echo $ac_n "checking for endgrent_r""... $ac_c" 1>&6 -echo "configure:9706: checking for endgrent_r" >&5 +echo "configure:9661: 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 <<EOF -#line 9711 "configure" +#line 9666 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char endgrent_r(); below. */ @@ -9730,7 +9685,7 @@ endgrent_r(); ; return 0; } EOF -if { (eval echo configure:9734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9689: \"$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 @@ -9762,12 +9717,12 @@ fi echo $ac_n "checking for setgrent_r""... $ac_c" 1>&6 -echo "configure:9766: checking for setgrent_r" >&5 +echo "configure:9721: 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 <<EOF -#line 9771 "configure" +#line 9726 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setgrent_r(); below. */ @@ -9790,7 +9745,7 @@ setgrent_r(); ; return 0; } EOF -if { (eval echo configure:9794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9749: \"$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 @@ -9821,12 +9776,12 @@ fi echo $ac_n "checking for gethostbyname_r""... $ac_c" 1>&6 -echo "configure:9825: checking for gethostbyname_r" >&5 +echo "configure:9780: 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 <<EOF -#line 9830 "configure" +#line 9785 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname_r(); below. */ @@ -9849,7 +9804,7 @@ gethostbyname_r(); ; return 0; } EOF -if { (eval echo configure:9853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9808: \"$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 @@ -9864,7 +9819,7 @@ fi if eval "test \"`echo '$ac_cv_func_'gethostbyname_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 9868 "configure" +#line 9823 "configure" #include "confdefs.h" #include <netdb.h> @@ -9875,7 +9830,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:9879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9834: \"$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" @@ -9885,6 +9840,7 @@ HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS char *buf, int buflen" HOST_R_ERRNO="#define HOST_R_ERRNO *h_errnop = h_errno" HOST_R_OK="#define HOST_R_OK hptr" HOST_R_RETURN="#define HOST_R_RETURN struct hostent *" +HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#undef HOSTENT_DATA" @@ -9893,7 +9849,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 9897 "configure" +#line 9853 "configure" #include "confdefs.h" #include <netdb.h> @@ -9905,7 +9861,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_ARGS="#define HOST_R_ARGS struct hostent_data *hdptr" @@ -9915,11 +9871,47 @@ HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS HOST_R_ARGS" HOST_R_ERRNO="#define HOST_R_ERRNO NULL" HOST_R_OK="#define HOST_R_OK 0" HOST_R_RETURN="#define HOST_R_RETURN int" +HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#define HOSTENT_DATA 1" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext <<EOF +#line 9883 "configure" +#include "confdefs.h" + +#define __USE_MISC +#include <netdb.h> +extern int gethostbyname_r (const char *, + struct hostent *, + char *, size_t, + struct hostent **, + int *); + +int main() { + +; return 0; } +EOF +if { (eval echo configure:9898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + +HOST_R_ARGS="#define HOST_R_ARGS char *buf, size_t buflen, struct hostent **answerp, int *h_errnop" +HOST_R_BAD="#define HOST_R_BAD ERANGE" +HOST_R_COPY="#define HOST_R_COPY buf, buflen" +HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS char *buf, int buflen" +HOST_R_ERRNO="#define HOST_R_ERRNO *h_errnop = h_errno" +HOST_R_OK="#define HOST_R_OK 0" +HOST_R_RETURN="#define HOST_R_RETURN int" +HOST_R_SETANSWER="#define HOST_R_SETANSWER 1" +HOSTENT_DATA="#undef HOSTENT_DATA" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* fi rm -f conftest* fi @@ -9934,6 +9926,7 @@ HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS char *buf, int buflen" HOST_R_ERRNO="#define HOST_R_ERRNO *h_errnop = h_errno" HOST_R_OK="#define HOST_R_OK hptr" HOST_R_RETURN="#define HOST_R_RETURN struct hostent *" +HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#undef HOSTENT_DATA" fi @@ -9947,13 +9940,14 @@ fi + echo $ac_n "checking for endhostent_r""... $ac_c" 1>&6 -echo "configure:9952: checking for endhostent_r" >&5 +echo "configure:9946: 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 <<EOF -#line 9957 "configure" +#line 9951 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char endhostent_r(); below. */ @@ -9976,7 +9970,7 @@ endhostent_r(); ; return 0; } EOF -if { (eval echo configure:9980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9974: \"$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 @@ -9991,7 +9985,7 @@ fi if eval "test \"`echo '$ac_cv_func_'endhostent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 9995 "configure" +#line 9989 "configure" #include "confdefs.h" #include <netdb.h> @@ -10001,7 +9995,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9999: \"$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" @@ -10012,7 +10006,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10016 "configure" +#line 10010 "configure" #include "confdefs.h" #include <netdb.h> @@ -10022,7 +10016,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_END_RESULT="#define HOST_R_END_RESULT(x)" @@ -10051,12 +10045,12 @@ fi echo $ac_n "checking for sethostent_r""... $ac_c" 1>&6 -echo "configure:10055: checking for sethostent_r" >&5 +echo "configure:10049: 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 <<EOF -#line 10060 "configure" +#line 10054 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sethostent_r(); below. */ @@ -10079,7 +10073,7 @@ sethostent_r(); ; return 0; } EOF -if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10077: \"$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 @@ -10094,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_func_'sethostent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 10098 "configure" +#line 10092 "configure" #include "confdefs.h" #include <netdb.h> @@ -10103,7 +10097,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10101: \"$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" @@ -10112,7 +10106,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10116 "configure" +#line 10110 "configure" #include "confdefs.h" #include <netdb.h> @@ -10121,7 +10115,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* HOST_R_SET_RESULT="#define HOST_R_SET_RESULT 0" HOST_R_SET_RETURN="#define HOST_R_SET_RETURN int" @@ -10146,9 +10140,9 @@ fi echo $ac_n "checking struct passwd element pw_class""... $ac_c" 1>&6 -echo "configure:10150: checking struct passwd element pw_class" >&5 +echo "configure:10144: checking struct passwd element pw_class" >&5 cat > conftest.$ac_ext <<EOF -#line 10152 "configure" +#line 10146 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10158,7 +10152,7 @@ int main() { struct passwd *pw; pw->pw_class = ""; ; return 0; } EOF -if { (eval echo configure:10162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -10176,7 +10170,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 10180 "configure" +#line 10174 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10188,7 +10182,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:10192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SETPWENT_VOID="#define SETPWENT_VOID 1" @@ -10203,7 +10197,7 @@ rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 10207 "configure" +#line 10201 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10215,7 +10209,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:10219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SETGRENT_VOID="#define SETGRENT_VOID 1" @@ -10230,12 +10224,12 @@ rm -f conftest* echo $ac_n "checking for getnetgrent_r""... $ac_c" 1>&6 -echo "configure:10234: checking for getnetgrent_r" >&5 +echo "configure:10228: 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 <<EOF -#line 10239 "configure" +#line 10233 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getnetgrent_r(); below. */ @@ -10258,7 +10252,7 @@ getnetgrent_r(); ; return 0; } EOF -if { (eval echo configure:10262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10256: \"$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 @@ -10273,7 +10267,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getnetgrent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 10277 "configure" +#line 10271 "configure" #include "confdefs.h" #include <netdb.h> @@ -10284,7 +10278,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:10288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NGR_R_ARGS="#define NGR_R_ARGS char *buf, int buflen" @@ -10300,7 +10294,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10304 "configure" +#line 10298 "configure" #include "confdefs.h" #include <netdb.h> @@ -10311,7 +10305,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:10315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NGR_R_ARGS="#define NGR_R_ARGS char *buf, size_t buflen" @@ -10327,7 +10321,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 10331 "configure" +#line 10325 "configure" #include "confdefs.h" #include <netdb.h> @@ -10338,7 +10332,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:10342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* NGR_R_ARGS="#define NGR_R_ARGS void **buf" @@ -10382,12 +10376,12 @@ fi echo $ac_n "checking for endnetgrent_r""... $ac_c" 1>&6 -echo "configure:10386: checking for endnetgrent_r" >&5 +echo "configure:10380: 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 <<EOF -#line 10391 "configure" +#line 10385 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char endnetgrent_r(); below. */ @@ -10410,7 +10404,7 @@ endnetgrent_r(); ; return 0; } EOF -if { (eval echo configure:10414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10408: \"$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 @@ -10445,12 +10439,12 @@ fi echo $ac_n "checking for setnetgrent_r""... $ac_c" 1>&6 -echo "configure:10449: checking for setnetgrent_r" >&5 +echo "configure:10443: 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 <<EOF -#line 10454 "configure" +#line 10448 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setnetgrent_r(); below. */ @@ -10473,7 +10467,7 @@ setnetgrent_r(); ; return 0; } EOF -if { (eval echo configure:10477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10471: \"$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 @@ -10501,12 +10495,12 @@ fi echo $ac_n "checking for innetgr_r""... $ac_c" 1>&6 -echo "configure:10505: checking for innetgr_r" >&5 +echo "configure:10499: 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 <<EOF -#line 10510 "configure" +#line 10504 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char innetgr_r(); below. */ @@ -10529,7 +10523,7 @@ innetgr_r(); ; return 0; } EOF -if { (eval echo configure:10533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10527: \"$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 @@ -10554,12 +10548,12 @@ fi echo $ac_n "checking for getprotoent_r""... $ac_c" 1>&6 -echo "configure:10558: checking for getprotoent_r" >&5 +echo "configure:10552: 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 <<EOF -#line 10563 "configure" +#line 10557 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getprotoent_r(); below. */ @@ -10582,7 +10576,7 @@ getprotoent_r(); ; return 0; } EOF -if { (eval echo configure:10586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10580: \"$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 @@ -10597,7 +10591,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getprotoent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 10601 "configure" +#line 10595 "configure" #include "confdefs.h" #include <netdb.h> @@ -10610,7 +10604,7 @@ return (0); ; return 0; } EOF -if { (eval echo configure:10614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROTO_R_ARGS="#define PROTO_R_ARGS char *buf, int buflen" @@ -10618,12 +10612,46 @@ PROTO_R_BAD="#define PROTO_R_BAD NULL" PROTO_R_COPY="#define PROTO_R_COPY buf, buflen" PROTO_R_COPY_ARGS="#define PROTO_R_COPY_ARGS PROTO_R_ARGS" PROTO_R_OK="#define PROTO_R_OK pptr" +PROTO_R_SETANSWER="#undef PROTO_R_SETANSWER" PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext <<EOF +#line 10625 "configure" +#include "confdefs.h" + +#include <netdb.h> +int getprotoent_r (struct protoent *, char *, size_t, struct protoent **); + + + +int main() { +return (0); + +; return 0; } +EOF +if { (eval echo configure:10638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + +PROTO_R_ARGS="#define PROTO_R_ARGS char *buf, size_t buflen, struct protoent **answerp" +PROTO_R_BAD="#define PROTO_R_BAD ERANGE" +PROTO_R_COPY="#define PROTO_R_COPY buf, buflen" +PROTO_R_COPY_ARGS="#define PROTO_R_COPY_ARGS char *buf, size_t buflen" +PROTO_R_OK="#define PROTO_R_OK 0" +PROTO_R_SETANSWER="#define PROTO_R_SETANSWER 1" +PROTO_R_RETURN="#define PROTO_R_RETURN int" + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + fi rm -f conftest* @@ -10634,6 +10662,7 @@ PROTO_R_BAD="#define PROTO_R_BAD NULL" PROTO_R_COPY="#define PROTO_R_COPY buf, buflen" PROTO_R_COPY_ARGS="#define PROTO_R_COPY_ARGS PROTO_R_ARGS" PROTO_R_OK="#define PROTO_R_OK pptr" +PROTO_R_SETANSWER="#undef PROTO_R_SETANSWER" PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *" fi @@ -10645,13 +10674,14 @@ fi + echo $ac_n "checking for endprotoent_r""... $ac_c" 1>&6 -echo "configure:10650: checking for endprotoent_r" >&5 +echo "configure:10680: 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 <<EOF -#line 10655 "configure" +#line 10685 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char endprotoent_r(); below. */ @@ -10674,7 +10704,7 @@ endprotoent_r(); ; return 0; } EOF -if { (eval echo configure:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10708: \"$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 @@ -10702,12 +10732,12 @@ fi echo $ac_n "checking for setprotoent_r""... $ac_c" 1>&6 -echo "configure:10706: checking for setprotoent_r" >&5 +echo "configure:10736: 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 <<EOF -#line 10711 "configure" +#line 10741 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setprotoent_r(); below. */ @@ -10730,7 +10760,7 @@ setprotoent_r(); ; return 0; } EOF -if { (eval echo configure:10734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10764: \"$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 @@ -10756,12 +10786,12 @@ fi echo $ac_n "checking for getpwent_r""... $ac_c" 1>&6 -echo "configure:10760: checking for getpwent_r" >&5 +echo "configure:10790: 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 <<EOF -#line 10765 "configure" +#line 10795 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getpwent_r(); below. */ @@ -10784,7 +10814,7 @@ getpwent_r(); ; return 0; } EOF -if { (eval echo configure:10788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10818: \"$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 @@ -10799,7 +10829,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getpwent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 10803 "configure" +#line 10833 "configure" #include "confdefs.h" #include <sys/types.h> @@ -10813,7 +10843,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10847: \"$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" @@ -10851,12 +10881,12 @@ fi echo $ac_n "checking for endpwent_r""... $ac_c" 1>&6 -echo "configure:10855: checking for endpwent_r" >&5 +echo "configure:10885: 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 <<EOF -#line 10860 "configure" +#line 10890 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char endpwent_r(); below. */ @@ -10879,7 +10909,7 @@ endpwent_r(); ; return 0; } EOF -if { (eval echo configure:10883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10913: \"$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 @@ -10894,7 +10924,7 @@ fi if eval "test \"`echo '$ac_cv_func_'endpwent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 10898 "configure" +#line 10928 "configure" #include "confdefs.h" #include <pwd.h> @@ -10904,7 +10934,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10938: \"$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" @@ -10932,12 +10962,12 @@ fi echo $ac_n "checking for setpassent_r""... $ac_c" 1>&6 -echo "configure:10936: checking for setpassent_r" >&5 +echo "configure:10966: 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 <<EOF -#line 10941 "configure" +#line 10971 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setpassent_r(); below. */ @@ -10960,7 +10990,7 @@ setpassent_r(); ; return 0; } EOF -if { (eval echo configure:10964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10994: \"$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 @@ -10984,12 +11014,12 @@ EOF fi echo $ac_n "checking for setpassent""... $ac_c" 1>&6 -echo "configure:10988: checking for setpassent" >&5 +echo "configure:11018: 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 <<EOF -#line 10993 "configure" +#line 11023 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setpassent(); below. */ @@ -11012,7 +11042,7 @@ setpassent(); ; return 0; } EOF -if { (eval echo configure:11016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11046: \"$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 @@ -11037,12 +11067,12 @@ fi echo $ac_n "checking for setpwent_r""... $ac_c" 1>&6 -echo "configure:11041: checking for setpwent_r" >&5 +echo "configure:11071: 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 <<EOF -#line 11046 "configure" +#line 11076 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setpwent_r(); below. */ @@ -11065,7 +11095,7 @@ setpwent_r(); ; return 0; } EOF -if { (eval echo configure:11069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11099: \"$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 @@ -11080,7 +11110,7 @@ fi if eval "test \"`echo '$ac_cv_func_'setpwent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 11084 "configure" +#line 11114 "configure" #include "confdefs.h" #include <pwd.h> @@ -11090,7 +11120,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11124: \"$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" @@ -11100,7 +11130,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 11104 "configure" +#line 11134 "configure" #include "confdefs.h" #include <pwd.h> @@ -11110,7 +11140,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PASS_R_SET_RESULT="#define PASS_R_SET_RESULT 0" PASS_R_SET_RETURN="#define PASS_R_SET_RETURN int" @@ -11139,12 +11169,12 @@ fi echo $ac_n "checking for getpwnam_r""... $ac_c" 1>&6 -echo "configure:11143: checking for getpwnam_r" >&5 +echo "configure:11173: 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 <<EOF -#line 11148 "configure" +#line 11178 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getpwnam_r(); below. */ @@ -11167,7 +11197,7 @@ getpwnam_r(); ; return 0; } EOF -if { (eval echo configure:11171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11201: \"$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 @@ -11191,12 +11221,12 @@ EOF fi echo $ac_n "checking for getpwuid_r""... $ac_c" 1>&6 -echo "configure:11195: checking for getpwuid_r" >&5 +echo "configure:11225: 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 <<EOF -#line 11200 "configure" +#line 11230 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getpwuid_r(); below. */ @@ -11219,7 +11249,7 @@ getpwuid_r(); ; return 0; } EOF -if { (eval echo configure:11223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11253: \"$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 @@ -11244,12 +11274,12 @@ fi echo $ac_n "checking for getservent_r""... $ac_c" 1>&6 -echo "configure:11248: checking for getservent_r" >&5 +echo "configure:11278: 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 <<EOF -#line 11253 "configure" +#line 11283 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getservent_r(); below. */ @@ -11272,7 +11302,7 @@ getservent_r(); ; return 0; } EOF -if { (eval echo configure:11276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11306: \"$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 @@ -11287,7 +11317,7 @@ fi if eval "test \"`echo '$ac_cv_func_'getservent_r`\" = yes"; then echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext <<EOF -#line 11291 "configure" +#line 11321 "configure" #include "confdefs.h" #include <netdb.h> @@ -11298,7 +11328,7 @@ int main() { return (0); ; return 0; } EOF -if { (eval echo configure:11302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen" @@ -11306,12 +11336,44 @@ SERV_R_BAD="#define SERV_R_BAD NULL" SERV_R_COPY="#define SERV_R_COPY buf, buflen" SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS SERV_R_ARGS" SERV_R_OK="#define SERV_R_OK sptr" +SERV_R_SETANSWER="#undef SERV_R_SETANSWER" SERV_R_RETURN="#define SERV_R_RETURN struct servent *" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext <<EOF +#line 11349 "configure" +#include "confdefs.h" + +#include <netdb.h> +int +getservent_r (struct servent *, char *, size_t, struct servent **); + +int main() { +return (0); +; return 0; } +EOF +if { (eval echo configure:11360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + +SERV_R_ARGS="#define SERV_R_ARGS char *buf, size_t buflen, struct servent **answerp" +SERV_R_BAD="#define SERV_R_BAD ERANGE" +SERV_R_COPY="#define SERV_R_COPY buf, buflen" +SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS char *buf, size_t buflen" +SERV_R_OK="#define SERV_R_OK (0)" +SERV_R_SETANSWER="#define SERV_R_SETANSWER 1" +SERV_R_RETURN="#define SERV_R_RETURN int" + + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + fi rm -f conftest* @@ -11322,6 +11384,7 @@ SERV_R_BAD="#define SERV_R_BAD NULL" SERV_R_COPY="#define SERV_R_COPY buf, buflen" SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS SERV_R_ARGS" SERV_R_OK="#define SERV_R_OK sptr" +SERV_R_SETANSWER="#undef SERV_R_SETANSWER" SERV_R_RETURN="#define SERV_R_RETURN struct servent *" fi @@ -11333,13 +11396,14 @@ fi + echo $ac_n "checking for endservent_r""... $ac_c" 1>&6 -echo "configure:11338: checking for endservent_r" >&5 +echo "configure:11402: 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 <<EOF -#line 11343 "configure" +#line 11407 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char endservent_r(); below. */ @@ -11362,7 +11426,7 @@ endservent_r(); ; return 0; } EOF -if { (eval echo configure:11366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11430: \"$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 @@ -11390,12 +11454,12 @@ fi echo $ac_n "checking for setservent_r""... $ac_c" 1>&6 -echo "configure:11394: checking for setservent_r" >&5 +echo "configure:11458: 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 <<EOF -#line 11399 "configure" +#line 11463 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setservent_r(); below. */ @@ -11418,7 +11482,7 @@ setservent_r(); ; return 0; } EOF -if { (eval echo configure:11422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11486: \"$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 @@ -11802,6 +11866,7 @@ s%@NET_R_BAD@%$NET_R_BAD%g s%@NET_R_COPY@%$NET_R_COPY%g s%@NET_R_COPY_ARGS@%$NET_R_COPY_ARGS%g s%@NET_R_OK@%$NET_R_OK%g +s%@NET_R_SETANSWER@%$NET_R_SETANSWER%g s%@NET_R_RETURN@%$NET_R_RETURN%g s%@NET_R_ENT_ARGS@%$NET_R_ENT_ARGS%g s%@NET_R_SET_RESULT@%$NET_R_SET_RESULT%g @@ -11824,6 +11889,7 @@ s%@HOST_R_COPY_ARGS@%$HOST_R_COPY_ARGS%g s%@HOST_R_ERRNO@%$HOST_R_ERRNO%g s%@HOST_R_OK@%$HOST_R_OK%g s%@HOST_R_RETURN@%$HOST_R_RETURN%g +s%@HOST_R_SETANSWER@%$HOST_R_SETANSWER%g s%@HOSTENT_DATA@%$HOSTENT_DATA%g s%@HOST_R_END_RESULT@%$HOST_R_END_RESULT%g s%@HOST_R_END_RETURN@%$HOST_R_END_RETURN%g @@ -11849,6 +11915,7 @@ s%@PROTO_R_BAD@%$PROTO_R_BAD%g s%@PROTO_R_COPY@%$PROTO_R_COPY%g s%@PROTO_R_COPY_ARGS@%$PROTO_R_COPY_ARGS%g s%@PROTO_R_OK@%$PROTO_R_OK%g +s%@PROTO_R_SETANSWER@%$PROTO_R_SETANSWER%g s%@PROTO_R_RETURN@%$PROTO_R_RETURN%g s%@PROTO_R_END_RESULT@%$PROTO_R_END_RESULT%g s%@PROTO_R_END_RETURN@%$PROTO_R_END_RETURN%g @@ -11871,6 +11938,7 @@ s%@SERV_R_BAD@%$SERV_R_BAD%g s%@SERV_R_COPY@%$SERV_R_COPY%g s%@SERV_R_COPY_ARGS@%$SERV_R_COPY_ARGS%g s%@SERV_R_OK@%$SERV_R_OK%g +s%@SERV_R_SETANSWER@%$SERV_R_SETANSWER%g s%@SERV_R_RETURN@%$SERV_R_RETURN%g s%@SERV_R_END_RESULT@%$SERV_R_END_RESULT%g s%@SERV_R_END_RETURN@%$SERV_R_END_RETURN%g @@ -11894,7 +11962,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 701a61d1..c3016e7c 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.65 $) +AC_REVISION($Revision: 1.74 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -1058,7 +1058,7 @@ esac AC_SUBST(HAVE_MINIMUM_IFREQ) # PORT_INCLUDE -PORT_INCLUDE= +PORT_INCLUDE=port/unknown/include SOLARIS_BITTYPES="#undef NEED_SOLARIS_BITTYPES" BSD_COMP="#undef BSD_COMP" USE_FIONBIO_IOCTL="#undef USE_FIONBIO_IOCTL" @@ -1096,6 +1096,9 @@ case "$host" in *-solaris2*) BSD_COMP="#define BSD_COMP 1" PORT_INCLUDE="port/solaris/include";; *-ultrix*) PORT_INCLUDE="port/ultrix/include";; + *-sco-sysv*uw2.0*) PORT_INCLUDE="port/unixware20/include";; + *-sco-sysv*uw2.1.2*) PORT_INCLUDE="port/unixware212/include";; + *-sco-sysv*uw7*) PORT_INCLUDE="port/unixware7/include";; esac AC_SUBST(BSD_COMP) AC_SUBST(SOLARIS_BITTYPES) @@ -1297,8 +1300,6 @@ AC_SUBST(ISC_PLATFORM_QUADFORMAT) # Security Stuff # AC_CHECK_FUNC(chroot, AC_DEFINE(HAVE_CHROOT)) -AC_CHECK_HEADERS(linux/capability.h) -AC_CHECK_HEADERS(sys/prctl.h) # # for accept, recvfrom, getpeername etc. @@ -1411,8 +1412,25 @@ NET_R_BAD="#define NET_R_BAD NULL" NET_R_COPY="#define NET_R_COPY buf, buflen" NET_R_COPY_ARGS="#define NET_R_COPY_ARGS NET_R_ARGS" NET_R_OK="#define NET_R_OK nptr" +NET_R_SETANSWER="#undef NET_R_SETANSWER" NET_R_RETURN="#define NET_R_RETURN struct netent *" ], +AC_TRY_COMPILE( +[#include <netdb.h> +int getnetbyaddr_r (unsigned long int, int, struct netent *, + char *, size_t, struct netent **, int *); +], +[return (0)], +[ +NET_R_ARGS="#define NET_R_ARGS char *buf, size_t buflen, struct netent **answerp, int *h_errnop" +NET_R_BAD="#define NET_R_BAD ERANGE" +NET_R_COPY="#define NET_R_COPY buf, buflen" +NET_R_COPY_ARGS="#define NET_R_COPY_ARGS char *buf, size_t buflen" +NET_R_OK="#define NET_R_OK 0" +NET_R_SETANSWER="#define NET_R_SETANSWER 1" +NET_R_RETURN="#define NET_R_RETURN int" +], +) ) , NET_R_ARGS="#define NET_R_ARGS char *buf, int buflen" @@ -1420,6 +1438,7 @@ NET_R_BAD="#define NET_R_BAD NULL" NET_R_COPY="#define NET_R_COPY buf, buflen" NET_R_COPY_ARGS="#define NET_R_COPY_ARGS NET_R_ARGS" NET_R_OK="#define NET_R_OK nptr" +NET_R_SETANSWER="#undef NET_R_SETANSWER" NET_R_RETURN="#define NET_R_RETURN struct netent *" ) AC_SUBST(NET_R_ARGS) @@ -1427,6 +1446,7 @@ AC_SUBST(NET_R_BAD) AC_SUBST(NET_R_COPY) AC_SUBST(NET_R_COPY_ARGS) AC_SUBST(NET_R_OK) +AC_SUBST(NET_R_SETANSWER) AC_SUBST(NET_R_RETURN) AC_CHECK_FUNC(setnetent_r, @@ -1512,6 +1532,7 @@ HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS char *buf, int buflen" HOST_R_ERRNO="#define HOST_R_ERRNO *h_errnop = h_errno" HOST_R_OK="#define HOST_R_OK hptr" HOST_R_RETURN="#define HOST_R_RETURN struct hostent *" +HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#undef HOSTENT_DATA" ] , @@ -1528,9 +1549,29 @@ HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS HOST_R_ARGS" HOST_R_ERRNO="#define HOST_R_ERRNO NULL" HOST_R_OK="#define HOST_R_OK 0" HOST_R_RETURN="#define HOST_R_RETURN int" +HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#define HOSTENT_DATA 1" ], -)) +AC_TRY_COMPILE([ +#define __USE_MISC +#include <netdb.h> +extern int gethostbyname_r (const char *, + struct hostent *, + char *, size_t, + struct hostent **, + int *); +],,[ +HOST_R_ARGS="#define HOST_R_ARGS char *buf, size_t buflen, struct hostent **answerp, int *h_errnop" +HOST_R_BAD="#define HOST_R_BAD ERANGE" +HOST_R_COPY="#define HOST_R_COPY buf, buflen" +HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS char *buf, int buflen" +HOST_R_ERRNO="#define HOST_R_ERRNO *h_errnop = h_errno" +HOST_R_OK="#define HOST_R_OK 0" +HOST_R_RETURN="#define HOST_R_RETURN int" +HOST_R_SETANSWER="#define HOST_R_SETANSWER 1" +HOSTENT_DATA="#undef HOSTENT_DATA" +], +))) , HOST_R_ARGS="#define HOST_R_ARGS char *buf, int buflen, int *h_errnop" HOST_R_BAD="#define HOST_R_BAD NULL" @@ -1539,6 +1580,7 @@ HOST_R_COPY_ARGS="#define HOST_R_COPY_ARGS char *buf, int buflen" HOST_R_ERRNO="#define HOST_R_ERRNO *h_errnop = h_errno" HOST_R_OK="#define HOST_R_OK hptr" HOST_R_RETURN="#define HOST_R_RETURN struct hostent *" +HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#undef HOSTENT_DATA" ) AC_SUBST(HOST_R_ARGS) @@ -1548,6 +1590,7 @@ AC_SUBST(HOST_R_COPY_ARGS) AC_SUBST(HOST_R_ERRNO) AC_SUBST(HOST_R_OK) AC_SUBST(HOST_R_RETURN) +AC_SUBST(HOST_R_SETANSWER) AC_SUBST(HOSTENT_DATA) AC_CHECK_FUNC(endhostent_r, @@ -1747,9 +1790,30 @@ PROTO_R_BAD="#define PROTO_R_BAD NULL" PROTO_R_COPY="#define PROTO_R_COPY buf, buflen" PROTO_R_COPY_ARGS="#define PROTO_R_COPY_ARGS PROTO_R_ARGS" PROTO_R_OK="#define PROTO_R_OK pptr" +PROTO_R_SETANSWER="#undef PROTO_R_SETANSWER" PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *" ] , +AC_TRY_COMPILE( +[ +#include <netdb.h> +int getprotoent_r (struct protoent *, char *, size_t, struct protoent **); + +] +, +[return (0);] +, +[ +PROTO_R_ARGS="#define PROTO_R_ARGS char *buf, size_t buflen, struct protoent **answerp" +PROTO_R_BAD="#define PROTO_R_BAD ERANGE" +PROTO_R_COPY="#define PROTO_R_COPY buf, buflen" +PROTO_R_COPY_ARGS="#define PROTO_R_COPY_ARGS char *buf, size_t buflen" +PROTO_R_OK="#define PROTO_R_OK 0" +PROTO_R_SETANSWER="#define PROTO_R_SETANSWER 1" +PROTO_R_RETURN="#define PROTO_R_RETURN int" +] +, +) ) , PROTO_R_ARGS="#define PROTO_R_ARGS char *buf, int buflen" @@ -1757,6 +1821,7 @@ PROTO_R_BAD="#define PROTO_R_BAD NULL" PROTO_R_COPY="#define PROTO_R_COPY buf, buflen" PROTO_R_COPY_ARGS="#define PROTO_R_COPY_ARGS PROTO_R_ARGS" PROTO_R_OK="#define PROTO_R_OK pptr" +PROTO_R_SETANSWER="#undef PROTO_R_SETANSWER" PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *" ) AC_SUBST(PROTO_R_ARGS) @@ -1764,6 +1829,7 @@ AC_SUBST(PROTO_R_BAD) AC_SUBST(PROTO_R_COPY) AC_SUBST(PROTO_R_COPY_ARGS) AC_SUBST(PROTO_R_OK) +AC_SUBST(PROTO_R_SETANSWER) AC_SUBST(PROTO_R_RETURN) AC_CHECK_FUNC(endprotoent_r, @@ -1882,9 +1948,26 @@ SERV_R_BAD="#define SERV_R_BAD NULL" SERV_R_COPY="#define SERV_R_COPY buf, buflen" SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS SERV_R_ARGS" SERV_R_OK="#define SERV_R_OK sptr" +SERV_R_SETANSWER="#undef SERV_R_SETANSWER" SERV_R_RETURN="#define SERV_R_RETURN struct servent *" ] , +AC_TRY_COMPILE([ +#include <netdb.h> +int +getservent_r (struct servent *, char *, size_t, struct servent **); +],[return (0);], +[ +SERV_R_ARGS="#define SERV_R_ARGS char *buf, size_t buflen, struct servent **answerp" +SERV_R_BAD="#define SERV_R_BAD ERANGE" +SERV_R_COPY="#define SERV_R_COPY buf, buflen" +SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS char *buf, size_t buflen" +SERV_R_OK="#define SERV_R_OK (0)" +SERV_R_SETANSWER="#define SERV_R_SETANSWER 1" +SERV_R_RETURN="#define SERV_R_RETURN int" +] +, +) ) , SERV_R_ARGS="#define SERV_R_ARGS char *buf, int buflen" @@ -1892,6 +1975,7 @@ SERV_R_BAD="#define SERV_R_BAD NULL" SERV_R_COPY="#define SERV_R_COPY buf, buflen" SERV_R_COPY_ARGS="#define SERV_R_COPY_ARGS SERV_R_ARGS" SERV_R_OK="#define SERV_R_OK sptr" +SERV_R_SETANSWER="#undef SERV_R_SETANSWER" SERV_R_RETURN="#define SERV_R_RETURN struct servent *" ) AC_SUBST(SERV_R_ARGS) @@ -1899,6 +1983,7 @@ AC_SUBST(SERV_R_BAD) AC_SUBST(SERV_R_COPY) AC_SUBST(SERV_R_COPY_ARGS) AC_SUBST(SERV_R_OK) +AC_SUBST(SERV_R_SETANSWER) AC_SUBST(SERV_R_RETURN) AC_CHECK_FUNC(endservent_r, diff --git a/lib/bind/include/netdb.h b/lib/bind/include/netdb.h index b9d9b779..996873e0 100644 --- a/lib/bind/include/netdb.h +++ b/lib/bind/include/netdb.h @@ -86,7 +86,7 @@ /* * @(#)netdb.h 8.1 (Berkeley) 6/2/93 - * $Id: netdb.h,v 1.5 2001/06/21 08:26:00 marka Exp $ + * $Id: netdb.h,v 1.10 2001/07/16 14:43:39 marka Exp $ */ #ifndef _NETDB_H_ @@ -437,35 +437,68 @@ void endservent_r __P((struct servent_data *)); #endif #else /* defined(sun) || defined(bsdi) */ +#ifdef __GLIBC__ +int gethostbyaddr_r __P((const char *, int, int, struct hostent *, + char *, size_t, struct hostent **, int *)); +int gethostbyname_r __P((const char *, struct hostent *, + char *, size_t, struct hostent **, int *)); +int gethostent_r __P((struct hostent *, char *, size_t, + struct hostent **, int *)); +#else struct hostent *gethostbyaddr_r __P((const char *, int, int, struct hostent *, char *, int, int *)); struct hostent *gethostbyname_r __P((const char *, struct hostent *, char *, int, int *)); struct hostent *gethostent_r __P((struct hostent *, char *, int, int *)); +#endif void sethostent_r __P((int)); void endhostent_r __P((void)); +#ifdef __GLIBC__ +int getnetbyname_r __P((const char *, struct netent *, + char *, size_t, struct netent **, int*)); +int getnetbyaddr_r __P((long, int, struct netent *, + char *, size_t, struct netent **, int*)); +int getnetent_r __P((struct netent *, char *, size_t, struct netent **, int*)); +#else struct netent *getnetbyname_r __P((const char *, struct netent *, char *, int)); struct netent *getnetbyaddr_r __P((long, int, struct netent *, char *, int)); struct netent *getnetent_r __P((struct netent *, char *, int)); +#endif void setnetent_r __P((int)); void endnetent_r __P((void)); +#ifdef __GLIBC__ +int getprotobyname_r __P((const char *, struct protoent *, char *, + size_t, struct protoent **)); +int getprotobynumber_r __P((int, struct protoent *, char *, size_t, + struct protoent **)); +int getprotoent_r __P((struct protoent *, char *, size_t, struct protoent **)); +#else struct protoent *getprotobyname_r __P((const char *, struct protoent *, char *, int)); struct protoent *getprotobynumber_r __P((int, struct protoent *, char *, int)); struct protoent *getprotoent_r __P((struct protoent *, char *, int)); +#endif void setprotoent_r __P((int)); void endprotoent_r __P((void)); +#ifdef __GLIBC__ +int getservbyname_r __P((const char *name, const char *, + struct servent *, char *, size_t, struct servent **)); +int getservbyport_r __P((int port, const char *, + struct servent *, char *, size_t, struct servent **)); +int getservent_r __P((struct servent *, char *, size_t, struct servent **)); +#else struct servent *getservbyname_r __P((const char *name, const char *, struct servent *, char *, int)); struct servent *getservbyport_r __P((int port, const char *, struct servent *, char *, int)); struct servent *getservent_r __P((struct servent *, char *, int)); +#endif void setservent_r __P((int)); void endservent_r __P((void)); diff --git a/lib/bind/inet/inet_pton.c b/lib/bind/inet/inet_pton.c index 69398434..61350254 100644 --- a/lib/bind/inet/inet_pton.c +++ b/lib/bind/inet/inet_pton.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: inet_pton.c,v 1.1 2001/03/29 06:31:41 marka Exp $"; +static const char rcsid[] = "$Id: inet_pton.c,v 1.2 2001/07/16 03:31:45 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include "port_before.h" @@ -95,10 +95,12 @@ inet_pton4(src, dst) if ((pch = strchr(digits, ch)) != NULL) { u_int new = *tp * 10 + (pch - digits); + if (saw_digit && *tp == 0) + return (0); if (new > 255) return (0); *tp = new; - if (! saw_digit) { + if (!saw_digit) { if (++octets > 4) return (0); saw_digit = 1; diff --git a/lib/bind/irs/gethostent_r.c b/lib/bind/irs/gethostent_r.c index 24706296..d05e0ef1 100644 --- a/lib/bind/irs/gethostent_r.c +++ b/lib/bind/irs/gethostent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: gethostent_r.c,v 1.2 2001/05/10 07:29:54 marka Exp $"; +static const char rcsid[] = "$Id: gethostent_r.c,v 1.4 2001/07/16 04:23:00 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <port_before.h> @@ -40,26 +40,50 @@ copy_hostent(struct hostent *, struct hostent *, HOST_R_COPY_ARGS); HOST_R_RETURN gethostbyname_r(const char *name, struct hostent *hptr, HOST_R_ARGS) { struct hostent *he = gethostbyname(name); +#ifdef HOST_R_SETANSWER + int n = 0; +#endif HOST_R_ERRNO; +#ifdef HOST_R_SETANSWER + if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) == 0) + *answerp = NULL; + else + *answerp = hptr; + + return (n); +#else if (he == NULL) return (HOST_R_BAD); return (copy_hostent(he, hptr, HOST_R_COPY)); +#endif } HOST_R_RETURN gethostbyaddr_r(const char *addr, int len, int type, struct hostent *hptr, HOST_R_ARGS) { struct hostent *he = gethostbyaddr(addr, len, type); +#ifdef HOST_R_SETANSWER + int n = 0; +#endif HOST_R_ERRNO; +#ifdef HOST_R_SETANSWER + if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) == 0) + *answerp = NULL; + else + *answerp = hptr; + + return (n); +#else if (he == NULL) return (HOST_R_BAD); return (copy_hostent(he, hptr, HOST_R_COPY)); +#endif } /* @@ -71,13 +95,25 @@ gethostbyaddr_r(const char *addr, int len, int type, HOST_R_RETURN gethostent_r(struct hostent *hptr, HOST_R_ARGS) { struct hostent *he = gethostent(); +#ifdef HOST_R_SETANSWER + int n = 0; +#endif HOST_R_ERRNO; +#ifdef HOST_R_SETANSWER + if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) == 0) + *answerp = NULL; + else + *answerp = hptr; + + return (n); +#else if (he == NULL) return (HOST_R_BAD); return (copy_hostent(he, hptr, HOST_R_COPY)); +#endif } HOST_R_SET_RETURN @@ -223,6 +259,6 @@ copy_hostent(struct hostent *he, struct hostent *hptr, HOST_R_COPY_ARGS) { } #endif /* !HOSTENT_DATA */ #else /* HOST_R_RETURN */ - static int gethostent_r_unknown_systemm = 0; + static int gethostent_r_unknown_system = 0; #endif /* HOST_R_RETURN */ #endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */ diff --git a/lib/bind/irs/getnetent_r.c b/lib/bind/irs/getnetent_r.c index 43e41fac..3d953d14 100644 --- a/lib/bind/irs/getnetent_r.c +++ b/lib/bind/irs/getnetent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getnetent_r.c,v 1.1 2001/03/29 06:31:46 marka Exp $"; +static const char rcsid[] = "$Id: getnetent_r.c,v 1.3 2001/07/16 08:05:20 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <port_before.h> @@ -40,11 +40,22 @@ copy_netent(struct netent *, struct netent *, NET_R_COPY_ARGS); NET_R_RETURN getnetbyname_r(const char *name, struct netent *nptr, NET_R_ARGS) { struct netent *ne = getnetbyname(name); +#ifdef NET_R_SETANSWER + int n = 0; + if (ne == NULL || (n = copy_netent(ne, nptr, NET_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = ne; + if (ne == NULL) + *h_errnop = h_errno; + return (n); +#else if (ne == NULL) return (NET_R_BAD); return (copy_netent(ne, nptr, NET_R_COPY)); +#endif } #ifndef GETNETBYADDR_ADDR_T @@ -53,11 +64,23 @@ getnetbyname_r(const char *name, struct netent *nptr, NET_R_ARGS) { NET_R_RETURN getnetbyaddr_r(GETNETBYADDR_ADDR_T addr, int type, struct netent *nptr, NET_R_ARGS) { struct netent *ne = getnetbyaddr(addr, type); +#ifdef NET_R_SETANSWER + int n = 0; + + if (ne == NULL || (n = copy_netent(ne, nptr, NET_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = ne; + if (ne == NULL) + *h_errnop = h_errno; + return (n); +#else if (ne == NULL) return (NET_R_BAD); return (copy_netent(ne, nptr, NET_R_COPY)); +#endif } /* @@ -69,11 +92,23 @@ getnetbyaddr_r(GETNETBYADDR_ADDR_T addr, int type, struct netent *nptr, NET_R_AR NET_R_RETURN getnetent_r(struct netent *nptr, NET_R_ARGS) { struct netent *ne = getnetent(); +#ifdef NET_R_SETANSWER + int n = 0; + + if (ne == NULL || (n = copy_netent(ne, nptr, NET_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = ne; + if (ne == NULL) + *h_errnop = h_errno; + return (n); +#else if (ne == NULL) return (NET_R_BAD); return (copy_netent(ne, nptr, NET_R_COPY)); +#endif } NET_R_SET_RETURN @@ -118,7 +153,7 @@ copy_netent(struct netent *ne, struct netent *nptr, NET_R_COPY_ARGS) { len += strlen(ne->n_name) + 1; len += numptr * sizeof(char*); - if (len > buflen) { + if (len > (int)buflen) { errno = ERANGE; return (NET_R_BAD); } @@ -187,6 +222,6 @@ copy_netent(struct netent *ne, struct netent *nptr, NET_R_COPY_ARGS) { } #endif /* !NETENT_DATA */ #else /* NET_R_RETURN */ - static int getnetent_r_unknown_systemm = 0; + static int getnetent_r_unknown_system = 0; #endif /* NET_R_RETURN */ #endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */ diff --git a/lib/bind/irs/getprotoent_r.c b/lib/bind/irs/getprotoent_r.c index 08876dad..78b93f80 100644 --- a/lib/bind/irs/getprotoent_r.c +++ b/lib/bind/irs/getprotoent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getprotoent_r.c,v 1.1 2001/03/29 06:31:47 marka Exp $"; +static const char rcsid[] = "$Id: getprotoent_r.c,v 1.3 2001/07/16 08:37:45 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <port_before.h> @@ -39,21 +39,41 @@ copy_protoent(struct protoent *, struct protoent *, PROTO_R_COPY_ARGS); PROTO_R_RETURN getprotobyname_r(const char *name, struct protoent *pptr, PROTO_R_ARGS) { struct protoent *pe = getprotobyname(name); +#ifdef PROTO_R_SETANSWER + int n = 0; + if (pe == NULL || (n = copy_protoent(pe, pptr, PROTO_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = pptr; + + return (n); +#else if (pe == NULL) return (PROTO_R_BAD); return (copy_protoent(pe, pptr, PROTO_R_COPY)); +#endif } PROTO_R_RETURN getprotobynumber_r(int proto, struct protoent *pptr, PROTO_R_ARGS) { struct protoent *pe = getprotobynumber(proto); +#ifdef PROTO_R_SETANSWER + int n = 0; + if (pe == NULL || (n = copy_protoent(pe, pptr, PROTO_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = pptr; + + return (n); +#else if (pe == NULL) return (PROTO_R_BAD); return (copy_protoent(pe, pptr, PROTO_R_COPY)); +#endif } /* @@ -65,11 +85,21 @@ getprotobynumber_r(int proto, struct protoent *pptr, PROTO_R_ARGS) { PROTO_R_RETURN getprotoent_r(struct protoent *pptr, PROTO_R_ARGS) { struct protoent *pe = getprotoent(); +#ifdef PROTO_R_SETANSWER + int n = 0; + if (pe == NULL || (n = copy_protoent(pe, pptr, PROTO_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = pptr; + + return (n); +#else if (pe == NULL) return (PROTO_R_BAD); return (copy_protoent(pe, pptr, PROTO_R_COPY)); +#endif } PROTO_R_SET_RETURN @@ -114,7 +144,7 @@ copy_protoent(struct protoent *pe, struct protoent *pptr, PROTO_R_COPY_ARGS) { len += strlen(pe->p_name) + 1; len += numptr * sizeof(char*); - if (len > buflen) { + if (len > (int)buflen) { errno = ERANGE; return (PROTO_R_BAD); } @@ -181,6 +211,6 @@ copy_protoent(struct protoent *pe, struct protoent *pptr, PROTO_R_COPY_ARGS) { } #endif /* PROTOENT_DATA */ #else /* PROTO_R_RETURN */ - static int getprotoent_r_unknown_systemm = 0; + static int getprotoent_r_unknown_system = 0; #endif /* PROTO_R_RETURN */ #endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */ diff --git a/lib/bind/irs/getpwent_r.c b/lib/bind/irs/getpwent_r.c index 0f89c63a..35baca14 100644 --- a/lib/bind/irs/getpwent_r.c +++ b/lib/bind/irs/getpwent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getpwent_r.c,v 1.4 2001/06/22 05:11:02 marka Exp $"; +static const char rcsid[] = "$Id: getpwent_r.c,v 1.5 2001/07/15 23:29:47 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <port_before.h> @@ -270,6 +270,6 @@ copy_passwd(struct passwd *pw, struct passwd *pwptr, char *buf, int buflen) { return (0); } #else /* PASS_R_RETURN */ - static int getpwent_r_unknown_systemm = 0; + static int getpwent_r_unknown_system = 0; #endif /* PASS_R_RETURN */ #endif /* !def(_REENTRANT) || !def(DO_PTHREADS) || !def(WANT_IRS_PW) */ diff --git a/lib/bind/irs/getservent_r.c b/lib/bind/irs/getservent_r.c index b9ecb2f3..e9984ec3 100644 --- a/lib/bind/irs/getservent_r.c +++ b/lib/bind/irs/getservent_r.c @@ -16,7 +16,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getservent_r.c,v 1.1 2001/03/29 06:31:48 marka Exp $"; +static const char rcsid[] = "$Id: getservent_r.c,v 1.3 2001/07/16 14:43:40 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <port_before.h> @@ -41,22 +41,42 @@ SERV_R_RETURN getservbyname_r(const char *name, const char *proto, struct servent *sptr, SERV_R_ARGS) { struct servent *se = getservbyname(name, proto); +#ifdef SERV_R_SETANSWER + int n = 0; + + if (se == NULL || (n = copy_servent(se, sptr, SERV_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = sptr; + return (n); +#else if (se == NULL) return (SERV_R_BAD); return (copy_servent(se, sptr, SERV_R_COPY)); +#endif } SERV_R_RETURN getservbyport_r(int port, const char *proto, struct servent *sptr, SERV_R_ARGS) { struct servent *se = getservbyport(port, proto); +#ifdef SERV_R_SETANSWER + int n = 0; + + if (se == NULL || (n = copy_servent(se, sptr, SERV_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = sptr; + return (n); +#else if (se == NULL) return (SERV_R_BAD); return (copy_servent(se, sptr, SERV_R_COPY)); +#endif } /* @@ -68,11 +88,21 @@ getservbyport_r(int port, const char *proto, SERV_R_RETURN getservent_r(struct servent *sptr, SERV_R_ARGS) { struct servent *se = getservent(); +#ifdef SERV_R_SETANSWER + int n = 0; + + if (se == NULL || (n = copy_servent(se, sptr, SERV_R_COPY)) != 0) + *answerp = NULL; + else + *answerp = sptr; + return (n); +#else if (se == NULL) return (SERV_R_BAD); return (copy_servent(se, sptr, SERV_R_COPY)); +#endif } SERV_R_SET_RETURN @@ -120,7 +150,7 @@ copy_servent(struct servent *se, struct servent *sptr, SERV_R_COPY_ARGS) { len += strlen(se->s_proto) + 1; len += numptr * sizeof(char*); - if (len > buflen) { + if (len > (int)buflen) { errno = ERANGE; return (SERV_R_BAD); } @@ -202,6 +232,6 @@ copy_servent(struct servent *se, struct servent *sptr, SERV_R_COPY_ARGS) { } #endif /* !SERVENT_DATA */ #else /*SERV_R_RETURN */ - static int getservent_r_unknown_systemm = 0; + static int getservent_r_unknown_system = 0; #endif /*SERV_R_RETURN */ #endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */ diff --git a/lib/bind/port/unknown/include/Makefile.in b/lib/bind/port/unknown/include/Makefile.in new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/lib/bind/port/unknown/include/Makefile.in diff --git a/lib/bind/port_before.h.in b/lib/bind/port_before.h.in index ff43e6d6..db8810d6 100644 --- a/lib/bind/port_before.h.in +++ b/lib/bind/port_before.h.in @@ -35,6 +35,7 @@ struct timezone; /* silence warning */ @NET_R_OK@ @NET_R_RETURN@ @NET_R_SET_RESULT@ +@NET_R_SETANSWER@ @NET_R_SET_RETURN@ @GROUP_R_RETURN@ @@ -57,6 +58,7 @@ struct timezone; /* silence warning */ @HOST_R_ERRNO@ @HOST_R_OK@ @HOST_R_RETURN@ +@HOST_R_SETANSWER@ @HOST_R_SET_RESULT@ @HOST_R_SET_RETURN@ @HOSTENT_DATA@ @@ -82,6 +84,7 @@ struct timezone; /* silence warning */ @PROTO_R_END_RETURN@ @PROTO_R_ENT_ARGS@ @PROTO_R_OK@ +@PROTO_R_SETANSWER@ @PROTO_R_RETURN@ @PROTO_R_SET_RESULT@ @PROTO_R_SET_RETURN@ @@ -106,6 +109,7 @@ struct timezone; /* silence warning */ @SERV_R_END_RETURN@ @SERV_R_ENT_ARGS@ @SERV_R_OK@ +@SERV_R_SETANSWER@ @SERV_R_RETURN@ @SERV_R_SET_RESULT@ @SERV_R_SET_RETURN@ diff --git a/lib/dns/gen-win32.h b/lib/dns/gen-win32.h index 385ca7db..1800fd23 100644 --- a/lib/dns/gen-win32.h +++ b/lib/dns/gen-win32.h @@ -48,7 +48,7 @@ * SUCH DAMAGE. */ -/* $Id: gen-win32.h,v 1.10 2001/07/09 21:27:45 gson Exp $ */ +/* $Id: gen-win32.h,v 1.11 2001/07/16 05:10:19 mayer Exp $ */ /* * Principal Authors: Computer Systems Research Group at UC Berkeley @@ -84,15 +84,11 @@ #include <isc/boolean.h> #include <isc/commandline.h> #include <isc/lang.h> +#include <isc/platform.h> -LIBISC_EXTERNAL_DATA int isc_commandline_index; /* Index into parent argv vector. */ -LIBISC_EXTERNAL_DATA int isc_commandline_option; /* Character checked for validity. */ - -LIBISC_EXTERNAL_DATA char *isc_commandline_argument; /* Argument associated with option. */ -LIBISC_EXTERNAL_DATA char *isc_commandline_progname; /* For printing error messages. */ - -LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_errprint; /* Print error messages. */ -LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_reset; /* Reset processing. */ +/* Index into parent argv vector. */ +/* Argument associated with option. */ +LIBISC_EXTERNAL_DATA char *isc_commandline_argument; #define BADOPT '?' #define BADARG ':' diff --git a/lib/dns/gen.c b/lib/dns/gen.c index 7b391a6e..7e39a583 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gen.c,v 1.62 2001/07/06 17:35:04 gson Exp $ */ +/* $Id: gen.c,v 1.64 2001/07/16 05:10:20 mayer Exp $ */ #include <config.h> @@ -34,7 +34,7 @@ #include "gen-unix.h" #endif -#define FROMTEXTARGS "rdclass, type, lexer, origin, downcase, target" +#define FROMTEXTARGS "rdclass, type, lexer, origin, downcase, target, callbacks" #define FROMTEXTCLASS "rdclass" #define FROMTEXTTYPE "type" #define FROMTEXTDEF "result = DNS_R_UNKNOWN" @@ -621,11 +621,11 @@ main(int argc, char **argv) { insert_into_typenames(254, "maila", METAQUESTIONONLY); insert_into_typenames(255, "any", METAQUESTIONONLY); - fprintf(stdout,"\ntypedef struct {\n"); - fprintf(stdout,"\tconst char *name;\n"); - fprintf(stdout,"\tunsigned int flags;\n"); - fprintf(stdout,"} typeattr_t;\n"); - fprintf(stdout,"static typeattr_t typeattr[] = {\n"); + fprintf(stdout, "\ntypedef struct {\n"); + fprintf(stdout, "\tconst char *name;\n"); + fprintf(stdout, "\tunsigned int flags;\n"); + fprintf(stdout, "} typeattr_t;\n"); + fprintf(stdout, "static typeattr_t typeattr[] = {\n"); for (i = 0 ; i <= 255 ; i++) { ttn = &typenames[i]; if (ttn->typename[0] == 0) { @@ -635,16 +635,16 @@ main(int argc, char **argv) { "DNS_RDATATYPEATTR_META"; else attrs = "DNS_RDATATYPEATTR_UNKNOWN"; - fprintf(stdout,"\t{ \"TYPE%d\", %s}%s\n", + fprintf(stdout, "\t{ \"TYPE%d\", %s}%s\n", i, attrs, PRINT_COMMA(i)); } else { - fprintf(stdout,"\t{ \"%s\", %s }%s\n", + fprintf(stdout, "\t{ \"%s\", %s }%s\n", upper(ttn->typename), upper(ttn->attr), PRINT_COMMA(i)); } } - fprintf(stdout,"};\n"); + fprintf(stdout, "};\n"); /* * Run through the list of types and pre-mark the unused @@ -666,20 +666,20 @@ main(int argc, char **argv) { * Here, walk the list from top to bottom, calculating * the hash (mod 256) for each name. */ - fprintf(stdout,"#define RDATATYPE_COMPARE(_s, _d, _tn, _tp) \\\n"); - fprintf(stdout,"\tdo { \\\n"); - fprintf(stdout,"\t\tif (strcasecmp(_s,(_tn)) == 0) { \\\n"); - fprintf(stdout,"\t\t\tif ((typeattr[_d].flags & " + fprintf(stdout, "#define RDATATYPE_COMPARE(_s, _d, _tn, _tp) \\\n"); + fprintf(stdout, "\tdo { \\\n"); + fprintf(stdout, "\t\tif (strcasecmp(_s,(_tn)) == 0) { \\\n"); + fprintf(stdout, "\t\t\tif ((typeattr[_d].flags & " "DNS_RDATATYPEATTR_RESERVED) != 0) \\\n"); - fprintf(stdout,"\t\t\t\treturn (ISC_R_NOTIMPLEMENTED); \\\n"); - fprintf(stdout,"\t\t\t*(_tp) = _d; \\\n"); - fprintf(stdout,"\t\t\treturn (ISC_R_SUCCESS); \\\n"); - fprintf(stdout,"\t\t} \\\n"); - fprintf(stdout,"\t} while (0)\n\n"); + fprintf(stdout, "\t\t\t\treturn (ISC_R_NOTIMPLEMENTED); \\\n"); + fprintf(stdout, "\t\t\t*(_tp) = _d; \\\n"); + fprintf(stdout, "\t\t\treturn (ISC_R_SUCCESS); \\\n"); + fprintf(stdout, "\t\t} \\\n"); + fprintf(stdout, "\t} while (0)\n\n"); - fprintf(stdout,"#define RDATATYPE_FROMTEXT_SW(_hash,_typename,_typep) " + fprintf(stdout, "#define RDATATYPE_FROMTEXT_SW(_hash,_typename,_typep) " "\\\n"); - fprintf(stdout,"\tswitch (_hash) { \\\n"); + fprintf(stdout, "\tswitch (_hash) { \\\n"); for (i = 0 ; i <= 255 ; i++) { ttn = &typenames[i]; @@ -690,7 +690,7 @@ main(int argc, char **argv) { continue; hash = HASH(ttn->typename); - fprintf(stdout,"\t\tcase %u: \\\n", hash); + fprintf(stdout, "\t\tcase %u: \\\n", hash); /* * Find all other entries that happen to match @@ -701,16 +701,16 @@ main(int argc, char **argv) { if (ttn2->sorted != 0) continue; if (hash == HASH(ttn2->typename)) { - fprintf(stdout,"\t\t\tRDATATYPE_COMPARE" + fprintf(stdout, "\t\t\tRDATATYPE_COMPARE" "(\"%s\", %u, " "_typename, _typep); \\\n", ttn2->typename, j); ttn2->sorted = 1; } } - fprintf(stdout,"\t\t\tbreak; \\\n"); + fprintf(stdout, "\t\t\tbreak; \\\n"); } - fprintf(stdout,"\t}\n"); + fprintf(stdout, "\t}\n"); fputs("#endif /* DNS_CODE_H */\n", stdout); } else if (type_enum) { @@ -769,22 +769,22 @@ main(int argc, char **argv) { char *s; int classnum; - fprintf(stdout,"#ifndef DNS_ENUMCLASS_H\n"); - fprintf(stdout,"#define DNS_ENUMCLASS_H 1\n\n"); + fprintf(stdout, "#ifndef DNS_ENUMCLASS_H\n"); + fprintf(stdout, "#define DNS_ENUMCLASS_H 1\n\n"); - fprintf(stdout,"enum {\n"); + fprintf(stdout, "enum {\n"); - fprintf(stdout,"\tdns_rdataclass_reserved0 = 0,\n"); - fprintf(stdout,"#define dns_rdataclass_reserved0 \\\n\t\t\t\t" + fprintf(stdout, "\tdns_rdataclass_reserved0 = 0,\n"); + fprintf(stdout, "#define dns_rdataclass_reserved0 \\\n\t\t\t\t" "((dns_rdataclass_t)dns_rdataclass_reserved0)\n"); #define PRINTCLASS(name, num) \ do { \ s = funname(name, buf1); \ classnum = num; \ - fprintf(stdout,"\tdns_rdataclass_%s = %d%s\n", s, classnum, \ + fprintf(stdout, "\tdns_rdataclass_%s = %d%s\n", s, classnum, \ classnum != 255 ? "," : ""); \ - fprintf(stdout,"#define dns_rdataclass_%s\t" \ + fprintf(stdout, "#define dns_rdataclass_%s\t" \ "((dns_rdataclass_t)dns_rdataclass_%s)\n", s, s); \ } while (0) @@ -801,8 +801,8 @@ main(int argc, char **argv) { #undef PRINTCLASS - fprintf(stdout,"};\n\n"); - fprintf(stdout,"#endif /* DNS_ENUMCLASS_H */\n"); + fprintf(stdout, "};\n\n"); + fprintf(stdout, "#endif /* DNS_ENUMCLASS_H */\n"); } else if (structs) { if (prefix != NULL) { if ((fd = fopen(prefix,"r")) != NULL) { diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index 076b52c0..ba690be4 100644 --- a/lib/dns/include/dns/log.h +++ b/lib/dns/include/dns/log.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.h,v 1.28 2001/01/11 19:38:11 gson Exp $ */ +/* $Id: log.h,v 1.29 2001/07/16 05:10:24 mayer Exp $ */ /* Principal Authors: DCL */ @@ -25,9 +25,9 @@ #include <isc/lang.h> #include <isc/log.h> -extern isc_log_t *dns_lctx; -extern isc_logcategory_t dns_categories[]; -extern isc_logmodule_t dns_modules[]; +LIBDNS_EXTERNAL_DATA extern isc_log_t *dns_lctx; +LIBDNS_EXTERNAL_DATA extern isc_logcategory_t dns_categories[]; +LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[]; #define DNS_LOGCATEGORY_NOTIFY (&dns_categories[0]) #define DNS_LOGCATEGORY_DATABASE (&dns_categories[1]) diff --git a/lib/dns/include/dns/masterdump.h b/lib/dns/include/dns/masterdump.h index 6d0f6ac7..509e6fa3 100644 --- a/lib/dns/include/dns/masterdump.h +++ b/lib/dns/include/dns/masterdump.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.h,v 1.21 2001/03/28 00:58:15 gson Exp $ */ +/* $Id: masterdump.h,v 1.22 2001/07/16 05:10:25 mayer Exp $ */ #ifndef DNS_MASTERDUMP_H #define DNS_MASTERDUMP_H 1 @@ -56,14 +56,15 @@ ISC_LANG_BEGINDECLS * tab stop for the TTL. The class is only printed for the first * rrset in the file and shares a tab stop with the RR type. */ -extern const dns_master_style_t dns_master_style_default; +LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_default; /* * A master file style that prints explicit TTL values on each * record line, never using $TTL statements. The TTL has a tab * stop of its own, but the class and type share one. */ -extern const dns_master_style_t dns_master_style_explicitttl; +LIBDNS_EXTERNAL_DATA extern const dns_master_style_t + dns_master_style_explicitttl; /* * A master style format designed for cache files. It prints explicit TTL @@ -82,7 +83,7 @@ extern const dns_master_style_t dns_master_style_simple; /* * The style used for debugging, "dig" output, etc. */ -extern const dns_master_style_t dns_master_style_debug; +LIBDNS_EXTERNAL_DATA extern const dns_master_style_t dns_master_style_debug; /*** *** Functions diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h index 5ba83467..0445b9b3 100644 --- a/lib/dns/include/dns/name.h +++ b/lib/dns/include/dns/name.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: name.h,v 1.93 2001/03/27 23:43:10 bwelling Exp $ */ +/* $Id: name.h,v 1.94 2001/07/16 05:10:26 mayer Exp $ */ #ifndef DNS_NAME_H #define DNS_NAME_H 1 @@ -209,7 +209,7 @@ struct dns_name { #define DNS_NAMEATTR_NCACHE 0x0400 /* Used by resolver. */ #define DNS_NAMEATTR_CHAINING 0x0800 /* Used by resolver. */ -extern dns_name_t *dns_rootname; +LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_rootname; extern dns_name_t *dns_wildcardname; /* diff --git a/lib/dns/include/dns/stats.h b/lib/dns/include/dns/stats.h index f37bce59..5ae90497 100644 --- a/lib/dns/include/dns/stats.h +++ b/lib/dns/include/dns/stats.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: stats.h,v 1.3 2001/01/23 01:50:29 bwelling Exp $ */ +/* $Id: stats.h,v 1.4 2001/07/16 05:10:27 mayer Exp $ */ #ifndef DNS_STATS_H #define DNS_STATS_H 1 @@ -36,7 +36,7 @@ typedef enum { #define DNS_STATS_NCOUNTERS 6 -extern const char *dns_statscounter_names[]; +LIBDNS_EXTERNAL_DATA extern const char *dns_statscounter_names[]; isc_result_t dns_stats_alloccounters(isc_mem_t *mctx, isc_uint64_t **ctrp); diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h index bbf225fe..8a8d7668 100644 --- a/lib/dns/include/dns/tsig.h +++ b/lib/dns/include/dns/tsig.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsig.h,v 1.39 2001/03/07 20:53:32 bwelling Exp $ */ +/* $Id: tsig.h,v 1.40 2001/07/16 05:10:28 mayer Exp $ */ #ifndef DNS_TSIG_H #define DNS_TSIG_H 1 @@ -33,7 +33,7 @@ /* * Algorithms. */ -extern dns_name_t *dns_tsig_hmacmd5_name; +LIBDNS_EXTERNAL_DATA extern dns_name_t *dns_tsig_hmacmd5_name; #define DNS_TSIG_HMACMD5_NAME dns_tsig_hmacmd5_name extern dns_name_t *dns_tsig_gssapi_name; #define DNS_TSIG_GSSAPI_NAME dns_tsig_gssapi_name diff --git a/lib/dns/log.c b/lib/dns/log.c index 192b3dfb..63689f4e 100644 --- a/lib/dns/log.c +++ b/lib/dns/log.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.31 2001/01/11 19:38:08 gson Exp $ */ +/* $Id: log.c,v 1.32 2001/07/16 05:10:21 mayer Exp $ */ /* Principal Authors: DCL */ @@ -29,7 +29,7 @@ * When adding a new category, be sure to add the appropriate * #define to <dns/log.h>. */ -isc_logcategory_t dns_categories[] = { +LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = { { "notify", 0 }, { "database", 0 }, { "security", 0 }, @@ -47,7 +47,7 @@ isc_logcategory_t dns_categories[] = { * When adding a new module, be sure to add the appropriate * #define to <dns/log.h>. */ -isc_logmodule_t dns_modules[] = { +LIBDNS_EXTERNAL_DATA isc_logmodule_t dns_modules[] = { { "dns/db", 0 }, { "dns/rbtdb", 0 }, { "dns/rbtdb64", 0 }, @@ -75,7 +75,7 @@ isc_logmodule_t dns_modules[] = { { NULL, 0 } }; -isc_log_t *dns_lctx = NULL; +LIBDNS_EXTERNAL_DATA isc_log_t *dns_lctx = NULL; void dns_log_init(isc_log_t *lctx) { diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c index 8c08176a..c805cd94 100644 --- a/lib/dns/masterdump.c +++ b/lib/dns/masterdump.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: masterdump.c,v 1.52 2001/07/06 22:53:48 gson Exp $ */ +/* $Id: masterdump.c,v 1.55 2001/07/16 17:15:08 gson Exp $ */ #include <config.h> @@ -129,7 +129,7 @@ typedef struct dns_totext_ctx { isc_boolean_t current_ttl_valid; } dns_totext_ctx_t; -const dns_master_style_t +LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_default = { DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS | @@ -142,7 +142,7 @@ dns_master_style_default = { 24, 24, 24, 32, 80, 8 }; -const dns_master_style_t +LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_explicitttl = { DNS_STYLEFLAG_OMIT_OWNER | DNS_STYLEFLAG_OMIT_CLASS | @@ -173,7 +173,7 @@ dns_master_style_simple = { /* * A style suitable for dns_rdataset_totext(). */ -const dns_master_style_t +LIBDNS_EXTERNAL_DATA const dns_master_style_t dns_master_style_debug = { DNS_STYLEFLAG_REL_OWNER, 24, 32, 40, 48, 80, 8 @@ -809,7 +809,8 @@ dump_rdatasets(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter, dns_rdataset_t *rds = sorted[i]; if (ctx->style.flags & DNS_STYLEFLAG_TRUST) { unsigned int trust = rds->trust; - INSIST(trust < (sizeof(trustnames) / sizeof(trustnames[0]))); + INSIST(trust < (sizeof(trustnames) / + sizeof(trustnames[0]))); fprintf(f, "; %s\n", trustnames[trust]); } if (rds->type == 0 && @@ -818,7 +819,7 @@ dump_rdatasets(isc_mem_t *mctx, dns_name_t *name, dns_rdatasetiter_t *rdsiter, } else { isc_result_t result = dump_rdataset(mctx, name, rds, ctx, - buffer, f); + buffer, f); if (result != ISC_R_SUCCESS) dumpresult = result; if ((ctx->style.flags & DNS_STYLEFLAG_OMIT_OWNER) != 0) diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 5729dbbb..f3fdd2d1 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rdata.c,v 1.144 2001/07/06 20:15:08 gson Exp $ */ +/* $Id: rdata.c,v 1.146 2001/07/16 09:48:05 bwelling Exp $ */ #include <config.h> #include <ctype.h> @@ -60,7 +60,8 @@ #define ARGS_FROMTEXT int rdclass, dns_rdatatype_t type, \ isc_lex_t *lexer, dns_name_t *origin, \ - isc_boolean_t downcase, isc_buffer_t *target + isc_boolean_t downcase, isc_buffer_t *target, \ + dns_rdatacallbacks_t *callbacks #define ARGS_TOTEXT dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, \ isc_buffer_t *target @@ -179,6 +180,25 @@ static isc_result_t rdata_totext(dns_rdata_t *rdata, dns_rdata_textctx_t *tctx, isc_buffer_t *target); +static inline int +getquad(const void *src, struct in_addr *dst, + isc_lex_t *lexer, dns_rdatacallbacks_t *callbacks) +{ + int result; + struct in_addr *tmp; + + result = inet_aton(src, dst); + if (result == 1 && callbacks != NULL && + inet_pton(AF_INET, src, &tmp) != 1) { + (*callbacks->warn)(callbacks, "%s:%lu: warning \"%s\" " + "is not a decimal dotted quad", + isc_lex_getsourcename(lexer), + isc_lex_getsourceline(lexer), + src); + } + return (result); +} + static inline isc_result_t name_duporclone(dns_name_t *source, isc_mem_t *mctx, dns_name_t *target) { @@ -359,6 +379,8 @@ dns_rdata_init(dns_rdata_t *rdata) { void dns_rdata_reset(dns_rdata_t *rdata) { + REQUIRE(rdata != NULL); + REQUIRE(!ISC_LINK_LINKED(rdata, link)); REQUIRE(DNS_RDATA_VALIDFLAGS(rdata)); @@ -376,6 +398,9 @@ dns_rdata_reset(dns_rdata_t *rdata) { void dns_rdata_clone(const dns_rdata_t *src, dns_rdata_t *target) { + REQUIRE(src != NULL); + REQUIRE(target != NULL); + REQUIRE(DNS_RDATA_INITIALIZED(target)); REQUIRE(DNS_RDATA_VALIDFLAGS(src)); diff --git a/lib/dns/rdata/any_255/tsig_250.c b/lib/dns/rdata/any_255/tsig_250.c index 2de6a8f5..776316e9 100644 --- a/lib/dns/rdata/any_255/tsig_250.c +++ b/lib/dns/rdata/any_255/tsig_250.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tsig_250.c,v 1.51 2001/06/21 04:00:28 marka Exp $ */ +/* $Id: tsig_250.c,v 1.52 2001/07/16 03:05:58 marka Exp $ */ /* Reviewed: Thu Mar 16 13:39:43 PST 2000 by gson */ @@ -40,6 +40,7 @@ fromtext_any_tsig(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Algorithm Name. diff --git a/lib/dns/rdata/generic/afsdb_18.c b/lib/dns/rdata/generic/afsdb_18.c index 90323cfc..68ac619e 100644 --- a/lib/dns/rdata/generic/afsdb_18.c +++ b/lib/dns/rdata/generic/afsdb_18.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: afsdb_18.c,v 1.38 2001/03/16 22:52:33 bwelling Exp $ */ +/* $Id: afsdb_18.c,v 1.39 2001/07/16 03:06:00 marka Exp $ */ /* Reviewed: Wed Mar 15 14:59:00 PST 2000 by explorer */ @@ -36,6 +36,7 @@ fromtext_afsdb(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Subtype. diff --git a/lib/dns/rdata/generic/cert_37.c b/lib/dns/rdata/generic/cert_37.c index 3e0cab84..51713502 100644 --- a/lib/dns/rdata/generic/cert_37.c +++ b/lib/dns/rdata/generic/cert_37.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cert_37.c,v 1.39 2001/06/21 04:00:30 marka Exp $ */ +/* $Id: cert_37.c,v 1.40 2001/07/16 03:06:01 marka Exp $ */ /* Reviewed: Wed Mar 15 21:14:32 EST 2000 by tale */ @@ -38,6 +38,7 @@ fromtext_cert(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); /* * Cert type. diff --git a/lib/dns/rdata/generic/cname_5.c b/lib/dns/rdata/generic/cname_5.c index 299f98e9..d597b90e 100644 --- a/lib/dns/rdata/generic/cname_5.c +++ b/lib/dns/rdata/generic/cname_5.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: cname_5.c,v 1.42 2001/03/16 22:52:36 bwelling Exp $ */ +/* $Id: cname_5.c,v 1.43 2001/07/16 03:06:03 marka Exp $ */ /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */ @@ -35,6 +35,7 @@ fromtext_cname(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/dname_39.c b/lib/dns/rdata/generic/dname_39.c index ad9df715..2f0d5f2f 100644 --- a/lib/dns/rdata/generic/dname_39.c +++ b/lib/dns/rdata/generic/dname_39.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dname_39.c,v 1.33 2001/04/27 21:02:00 gson Exp $ */ +/* $Id: dname_39.c,v 1.34 2001/07/16 03:06:04 marka Exp $ */ /* Reviewed: Wed Mar 15 16:52:38 PST 2000 by explorer */ @@ -36,6 +36,7 @@ fromtext_dname(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/gpos_27.c b/lib/dns/rdata/generic/gpos_27.c index ac8efb19..21c31bf6 100644 --- a/lib/dns/rdata/generic/gpos_27.c +++ b/lib/dns/rdata/generic/gpos_27.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gpos_27.c,v 1.31 2001/06/21 04:00:31 marka Exp $ */ +/* $Id: gpos_27.c,v 1.32 2001/07/16 03:06:05 marka Exp $ */ /* reviewed: Wed Mar 15 16:48:45 PST 2000 by brister */ @@ -37,6 +37,7 @@ fromtext_gpos(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); for (i = 0; i < 3 ; i++) { RETERR(isc_lex_getmastertoken(lexer, &token, diff --git a/lib/dns/rdata/generic/hinfo_13.c b/lib/dns/rdata/generic/hinfo_13.c index fd02b40b..88017dce 100644 --- a/lib/dns/rdata/generic/hinfo_13.c +++ b/lib/dns/rdata/generic/hinfo_13.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: hinfo_13.c,v 1.36 2001/06/21 04:00:32 marka Exp $ */ +/* $Id: hinfo_13.c,v 1.37 2001/07/16 03:06:06 marka Exp $ */ /* * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley. @@ -35,6 +35,7 @@ fromtext_hinfo(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); REQUIRE(type == 13); diff --git a/lib/dns/rdata/generic/isdn_20.c b/lib/dns/rdata/generic/isdn_20.c index 6ea35549..f56ea005 100644 --- a/lib/dns/rdata/generic/isdn_20.c +++ b/lib/dns/rdata/generic/isdn_20.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: isdn_20.c,v 1.29 2001/06/21 04:00:33 marka Exp $ */ +/* $Id: isdn_20.c,v 1.30 2001/07/16 03:06:08 marka Exp $ */ /* Reviewed: Wed Mar 15 16:53:11 PST 2000 by bwelling */ @@ -36,6 +36,7 @@ fromtext_isdn(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); /* ISDN-address */ RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring, diff --git a/lib/dns/rdata/generic/key_25.c b/lib/dns/rdata/generic/key_25.c index efe30b25..d1688be0 100644 --- a/lib/dns/rdata/generic/key_25.c +++ b/lib/dns/rdata/generic/key_25.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: key_25.c,v 1.40 2001/06/21 04:00:34 marka Exp $ */ +/* $Id: key_25.c,v 1.41 2001/07/16 03:06:09 marka Exp $ */ /* * Reviewed: Wed Mar 15 16:47:10 PST 2000 by halley. @@ -43,6 +43,7 @@ fromtext_key(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); /* flags */ RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, diff --git a/lib/dns/rdata/generic/loc_29.c b/lib/dns/rdata/generic/loc_29.c index 9f10f2a9..199bf57e 100644 --- a/lib/dns/rdata/generic/loc_29.c +++ b/lib/dns/rdata/generic/loc_29.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: loc_29.c,v 1.29 2001/03/16 22:52:43 bwelling Exp $ */ +/* $Id: loc_29.c,v 1.30 2001/07/16 03:06:10 marka Exp $ */ /* Reviewed: Wed Mar 15 18:13:09 PST 2000 by explorer */ @@ -56,6 +56,7 @@ fromtext_loc(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); /* * Defaults. diff --git a/lib/dns/rdata/generic/mb_7.c b/lib/dns/rdata/generic/mb_7.c index 09e54edb..6236b69f 100644 --- a/lib/dns/rdata/generic/mb_7.c +++ b/lib/dns/rdata/generic/mb_7.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mb_7.c,v 1.40 2001/03/16 22:52:44 bwelling Exp $ */ +/* $Id: mb_7.c,v 1.41 2001/07/16 03:06:11 marka Exp $ */ /* Reviewed: Wed Mar 15 17:31:26 PST 2000 by bwelling */ @@ -34,6 +34,7 @@ fromtext_mb(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/md_3.c b/lib/dns/rdata/generic/md_3.c index 44e33e7f..fc9dffe1 100644 --- a/lib/dns/rdata/generic/md_3.c +++ b/lib/dns/rdata/generic/md_3.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: md_3.c,v 1.42 2001/03/16 22:52:45 bwelling Exp $ */ +/* $Id: md_3.c,v 1.43 2001/07/16 03:06:13 marka Exp $ */ /* Reviewed: Wed Mar 15 17:48:20 PST 2000 by bwelling */ @@ -34,6 +34,7 @@ fromtext_md(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/mf_4.c b/lib/dns/rdata/generic/mf_4.c index a22c7218..250c94a7 100644 --- a/lib/dns/rdata/generic/mf_4.c +++ b/lib/dns/rdata/generic/mf_4.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mf_4.c,v 1.40 2001/03/16 22:52:46 bwelling Exp $ */ +/* $Id: mf_4.c,v 1.41 2001/07/16 03:06:14 marka Exp $ */ /* reviewed: Wed Mar 15 17:47:33 PST 2000 by brister */ @@ -34,6 +34,7 @@ fromtext_mf(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/mg_8.c b/lib/dns/rdata/generic/mg_8.c index 889d22a6..4c634a7f 100644 --- a/lib/dns/rdata/generic/mg_8.c +++ b/lib/dns/rdata/generic/mg_8.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mg_8.c,v 1.38 2001/03/16 22:52:47 bwelling Exp $ */ +/* $Id: mg_8.c,v 1.39 2001/07/16 03:06:15 marka Exp $ */ /* reviewed: Wed Mar 15 17:49:21 PST 2000 by brister */ @@ -34,6 +34,7 @@ fromtext_mg(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/minfo_14.c b/lib/dns/rdata/generic/minfo_14.c index ef5bf191..02046404 100644 --- a/lib/dns/rdata/generic/minfo_14.c +++ b/lib/dns/rdata/generic/minfo_14.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: minfo_14.c,v 1.39 2001/03/16 22:52:49 bwelling Exp $ */ +/* $Id: minfo_14.c,v 1.40 2001/07/16 03:06:17 marka Exp $ */ /* reviewed: Wed Mar 15 17:45:32 PST 2000 by brister */ @@ -35,6 +35,7 @@ fromtext_minfo(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); for (i = 0; i < 2 ; i++) { RETERR(isc_lex_getmastertoken(lexer, &token, diff --git a/lib/dns/rdata/generic/mr_9.c b/lib/dns/rdata/generic/mr_9.c index 6f9754f1..7c11a430 100644 --- a/lib/dns/rdata/generic/mr_9.c +++ b/lib/dns/rdata/generic/mr_9.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mr_9.c,v 1.37 2001/03/16 22:52:50 bwelling Exp $ */ +/* $Id: mr_9.c,v 1.38 2001/07/16 03:06:18 marka Exp $ */ /* Reviewed: Wed Mar 15 21:30:35 EST 2000 by tale */ @@ -34,6 +34,7 @@ fromtext_mr(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/mx_15.c b/lib/dns/rdata/generic/mx_15.c index 290edec5..5be0a3ae 100644 --- a/lib/dns/rdata/generic/mx_15.c +++ b/lib/dns/rdata/generic/mx_15.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mx_15.c,v 1.47 2001/03/16 22:52:52 bwelling Exp $ */ +/* $Id: mx_15.c,v 1.48 2001/07/16 03:06:19 marka Exp $ */ /* reviewed: Wed Mar 15 18:05:46 PST 2000 by brister */ @@ -34,6 +34,7 @@ fromtext_mx(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/ns_2.c b/lib/dns/rdata/generic/ns_2.c index bf09e54e..64516c95 100644 --- a/lib/dns/rdata/generic/ns_2.c +++ b/lib/dns/rdata/generic/ns_2.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ns_2.c,v 1.41 2001/03/16 22:52:53 bwelling Exp $ */ +/* $Id: ns_2.c,v 1.42 2001/07/16 03:06:20 marka Exp $ */ /* Reviewed: Wed Mar 15 18:15:00 PST 2000 by bwelling */ @@ -34,6 +34,7 @@ fromtext_ns(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token,isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/null_10.c b/lib/dns/rdata/generic/null_10.c index 36a8d5fa..918f31c1 100644 --- a/lib/dns/rdata/generic/null_10.c +++ b/lib/dns/rdata/generic/null_10.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: null_10.c,v 1.34 2001/06/21 04:00:36 marka Exp $ */ +/* $Id: null_10.c,v 1.35 2001/07/16 03:06:22 marka Exp $ */ /* Reviewed: Thu Mar 16 13:57:50 PST 2000 by explorer */ @@ -34,6 +34,7 @@ fromtext_null(ARGS_FROMTEXT) { UNUSED(origin); UNUSED(downcase); UNUSED(target); + UNUSED(callbacks); return (DNS_R_SYNTAX); } diff --git a/lib/dns/rdata/generic/nxt_30.c b/lib/dns/rdata/generic/nxt_30.c index ac9c9e9e..c0c719de 100644 --- a/lib/dns/rdata/generic/nxt_30.c +++ b/lib/dns/rdata/generic/nxt_30.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nxt_30.c,v 1.48 2001/03/16 22:52:56 bwelling Exp $ */ +/* $Id: nxt_30.c,v 1.49 2001/07/16 03:06:23 marka Exp $ */ /* reviewed: Wed Mar 15 18:21:15 PST 2000 by brister */ @@ -46,6 +46,7 @@ fromtext_nxt(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Next domain. diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c index f2762b51..c2d7a752 100644 --- a/lib/dns/rdata/generic/opt_41.c +++ b/lib/dns/rdata/generic/opt_41.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: opt_41.c,v 1.24 2001/06/21 04:00:37 marka Exp $ */ +/* $Id: opt_41.c,v 1.25 2001/07/16 03:06:24 marka Exp $ */ /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */ @@ -42,6 +42,7 @@ fromtext_opt(ARGS_FROMTEXT) { UNUSED(origin); UNUSED(downcase); UNUSED(target); + UNUSED(callbacks); return (ISC_R_NOTIMPLEMENTED); } diff --git a/lib/dns/rdata/generic/ptr_12.c b/lib/dns/rdata/generic/ptr_12.c index 9a46626b..9fccd5b9 100644 --- a/lib/dns/rdata/generic/ptr_12.c +++ b/lib/dns/rdata/generic/ptr_12.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ptr_12.c,v 1.38 2001/03/16 22:52:58 bwelling Exp $ */ +/* $Id: ptr_12.c,v 1.39 2001/07/16 03:06:26 marka Exp $ */ /* Reviewed: Thu Mar 16 14:05:12 PST 2000 by explorer */ @@ -34,6 +34,7 @@ fromtext_ptr(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/rp_17.c b/lib/dns/rdata/generic/rp_17.c index c531004f..0ec376bb 100644 --- a/lib/dns/rdata/generic/rp_17.c +++ b/lib/dns/rdata/generic/rp_17.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rp_17.c,v 1.34 2001/03/16 22:52:59 bwelling Exp $ */ +/* $Id: rp_17.c,v 1.35 2001/07/16 03:06:27 marka Exp $ */ /* RFC 1183 */ @@ -35,6 +35,7 @@ fromtext_rp(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); origin = (origin != NULL) ? origin : dns_rootname; diff --git a/lib/dns/rdata/generic/rt_21.c b/lib/dns/rdata/generic/rt_21.c index 76dcef8e..ad763828 100644 --- a/lib/dns/rdata/generic/rt_21.c +++ b/lib/dns/rdata/generic/rt_21.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rt_21.c,v 1.36 2001/03/16 22:53:00 bwelling Exp $ */ +/* $Id: rt_21.c,v 1.37 2001/07/16 03:06:28 marka Exp $ */ /* reviewed: Thu Mar 16 15:02:31 PST 2000 by brister */ @@ -36,6 +36,7 @@ fromtext_rt(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); diff --git a/lib/dns/rdata/generic/sig_24.c b/lib/dns/rdata/generic/sig_24.c index bf24f3ad..36d3140e 100644 --- a/lib/dns/rdata/generic/sig_24.c +++ b/lib/dns/rdata/generic/sig_24.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: sig_24.c,v 1.53 2001/06/21 04:00:38 marka Exp $ */ +/* $Id: sig_24.c,v 1.54 2001/07/16 03:06:29 marka Exp $ */ /* Reviewed: Fri Mar 17 09:05:02 PST 2000 by gson */ @@ -42,6 +42,7 @@ fromtext_sig(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Type covered. diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index a2484bf5..4de3f2bb 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: soa_6.c,v 1.51 2001/03/16 22:53:02 bwelling Exp $ */ +/* $Id: soa_6.c,v 1.52 2001/07/16 03:06:31 marka Exp $ */ /* Reviewed: Thu Mar 16 15:18:32 PST 2000 by explorer */ @@ -36,6 +36,7 @@ fromtext_soa(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); origin = (origin != NULL) ? origin : dns_rootname; diff --git a/lib/dns/rdata/generic/tkey_249.c b/lib/dns/rdata/generic/tkey_249.c index 7dd78fdf..159cfda4 100644 --- a/lib/dns/rdata/generic/tkey_249.c +++ b/lib/dns/rdata/generic/tkey_249.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: tkey_249.c,v 1.47 2001/06/21 04:00:39 marka Exp $ */ +/* $Id: tkey_249.c,v 1.48 2001/07/16 03:06:32 marka Exp $ */ /* * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley. @@ -41,6 +41,7 @@ fromtext_tkey(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Algorithm. diff --git a/lib/dns/rdata/generic/txt_16.c b/lib/dns/rdata/generic/txt_16.c index 8052c2dd..989f1763 100644 --- a/lib/dns/rdata/generic/txt_16.c +++ b/lib/dns/rdata/generic/txt_16.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: txt_16.c,v 1.36 2001/06/21 04:00:41 marka Exp $ */ +/* $Id: txt_16.c,v 1.37 2001/07/16 03:06:33 marka Exp $ */ /* Reviewed: Thu Mar 16 15:40:00 PST 2000 by bwelling */ @@ -35,6 +35,7 @@ fromtext_txt(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); strings = 0; for (;;) { diff --git a/lib/dns/rdata/generic/unspec_103.c b/lib/dns/rdata/generic/unspec_103.c index 0a9e8324..afcb9a75 100644 --- a/lib/dns/rdata/generic/unspec_103.c +++ b/lib/dns/rdata/generic/unspec_103.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: unspec_103.c,v 1.27 2001/06/21 04:00:42 marka Exp $ */ +/* $Id: unspec_103.c,v 1.28 2001/07/16 03:06:35 marka Exp $ */ #ifndef RDATA_GENERIC_UNSPEC_103_C #define RDATA_GENERIC_UNSPEC_103_C @@ -31,6 +31,7 @@ fromtext_unspec(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); return (atob_tobuffer(lexer, target)); } diff --git a/lib/dns/rdata/generic/x25_19.c b/lib/dns/rdata/generic/x25_19.c index 5710154e..272c5695 100644 --- a/lib/dns/rdata/generic/x25_19.c +++ b/lib/dns/rdata/generic/x25_19.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: x25_19.c,v 1.30 2001/06/21 04:00:43 marka Exp $ */ +/* $Id: x25_19.c,v 1.31 2001/07/16 03:06:36 marka Exp $ */ /* Reviewed: Thu Mar 16 16:15:57 PST 2000 by bwelling */ @@ -37,6 +37,7 @@ fromtext_x25(ARGS_FROMTEXT) { UNUSED(rdclass); UNUSED(origin); UNUSED(downcase); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_qstring, ISC_FALSE)); diff --git a/lib/dns/rdata/hs_4/a_1.c b/lib/dns/rdata/hs_4/a_1.c index 2ad87c49..2fbc7cb4 100644 --- a/lib/dns/rdata/hs_4/a_1.c +++ b/lib/dns/rdata/hs_4/a_1.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a_1.c,v 1.24 2001/03/16 22:53:08 bwelling Exp $ */ +/* $Id: a_1.c,v 1.25 2001/07/16 03:06:37 marka Exp $ */ /* reviewed: Thu Mar 16 15:58:36 PST 2000 by brister */ @@ -43,7 +43,7 @@ fromtext_hs_a(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); - if (inet_aton(token.value.as_pointer, &addr) != 1) + if (getquad(token.value.as_pointer, &addr, lexer, callbacks) != 1) RETTOK(DNS_R_BADDOTTEDQUAD); isc_buffer_availableregion(target, ®ion); if (region.length < 4) diff --git a/lib/dns/rdata/in_1/a6_38.c b/lib/dns/rdata/in_1/a6_38.c index f975c129..62ceb462 100644 --- a/lib/dns/rdata/in_1/a6_38.c +++ b/lib/dns/rdata/in_1/a6_38.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a6_38.c,v 1.44 2001/03/16 22:53:10 bwelling Exp $ */ +/* $Id: a6_38.c,v 1.45 2001/07/16 03:06:39 marka Exp $ */ /* draft-ietf-ipngwg-dns-lookups-03.txt */ @@ -41,6 +41,7 @@ fromtext_in_a6(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Prefix length. diff --git a/lib/dns/rdata/in_1/a_1.c b/lib/dns/rdata/in_1/a_1.c index 58514ea9..e731e586 100644 --- a/lib/dns/rdata/in_1/a_1.c +++ b/lib/dns/rdata/in_1/a_1.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: a_1.c,v 1.45 2001/03/16 22:53:11 bwelling Exp $ */ +/* $Id: a_1.c,v 1.46 2001/07/16 03:06:40 marka Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -45,7 +45,7 @@ fromtext_in_a(ARGS_FROMTEXT) { RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); - if (inet_aton(token.value.as_pointer, &addr) != 1) + if (getquad(token.value.as_pointer, &addr, lexer, callbacks) != 1) RETTOK(DNS_R_BADDOTTEDQUAD); isc_buffer_availableregion(target, ®ion); if (region.length < 4) diff --git a/lib/dns/rdata/in_1/aaaa_28.c b/lib/dns/rdata/in_1/aaaa_28.c index 7c7d3704..d6089f3c 100644 --- a/lib/dns/rdata/in_1/aaaa_28.c +++ b/lib/dns/rdata/in_1/aaaa_28.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: aaaa_28.c,v 1.35 2001/03/16 22:53:12 bwelling Exp $ */ +/* $Id: aaaa_28.c,v 1.36 2001/07/16 03:06:41 marka Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -41,6 +41,7 @@ fromtext_in_aaaa(ARGS_FROMTEXT) { UNUSED(origin); UNUSED(downcase); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/in_1/kx_36.c b/lib/dns/rdata/in_1/kx_36.c index 15128da2..3795f2ce 100644 --- a/lib/dns/rdata/in_1/kx_36.c +++ b/lib/dns/rdata/in_1/kx_36.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: kx_36.c,v 1.36 2001/03/16 22:53:13 bwelling Exp $ */ +/* $Id: kx_36.c,v 1.37 2001/07/16 03:06:43 marka Exp $ */ /* Reviewed: Thu Mar 16 17:24:54 PST 2000 by explorer */ @@ -37,6 +37,7 @@ fromtext_in_kx(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_number, ISC_FALSE)); diff --git a/lib/dns/rdata/in_1/naptr_35.c b/lib/dns/rdata/in_1/naptr_35.c index 808a2b39..292b50ef 100644 --- a/lib/dns/rdata/in_1/naptr_35.c +++ b/lib/dns/rdata/in_1/naptr_35.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: naptr_35.c,v 1.42 2001/06/21 04:00:45 marka Exp $ */ +/* $Id: naptr_35.c,v 1.43 2001/07/16 03:06:44 marka Exp $ */ /* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */ @@ -37,6 +37,7 @@ fromtext_in_naptr(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Order. diff --git a/lib/dns/rdata/in_1/nsap-ptr_23.c b/lib/dns/rdata/in_1/nsap-ptr_23.c index e396b924..adad651d 100644 --- a/lib/dns/rdata/in_1/nsap-ptr_23.c +++ b/lib/dns/rdata/in_1/nsap-ptr_23.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsap-ptr_23.c,v 1.31 2001/03/16 22:53:15 bwelling Exp $ */ +/* $Id: nsap-ptr_23.c,v 1.32 2001/07/16 03:06:46 marka Exp $ */ /* Reviewed: Fri Mar 17 10:16:02 PST 2000 by gson */ @@ -37,6 +37,7 @@ fromtext_in_nsap_ptr(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, ISC_FALSE)); diff --git a/lib/dns/rdata/in_1/nsap_22.c b/lib/dns/rdata/in_1/nsap_22.c index 244aad18..971d55bc 100644 --- a/lib/dns/rdata/in_1/nsap_22.c +++ b/lib/dns/rdata/in_1/nsap_22.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nsap_22.c,v 1.32 2001/06/21 04:00:46 marka Exp $ */ +/* $Id: nsap_22.c,v 1.33 2001/07/16 03:06:47 marka Exp $ */ /* Reviewed: Fri Mar 17 10:41:07 PST 2000 by gson */ @@ -41,6 +41,7 @@ fromtext_in_nsap(ARGS_FROMTEXT) { UNUSED(origin); UNUSED(downcase); UNUSED(rdclass); + UNUSED(callbacks); /* 0x<hex.string.with.periods> */ RETERR(isc_lex_getmastertoken(lexer, &token, isc_tokentype_string, diff --git a/lib/dns/rdata/in_1/px_26.c b/lib/dns/rdata/in_1/px_26.c index df6afbc0..e5f8588d 100644 --- a/lib/dns/rdata/in_1/px_26.c +++ b/lib/dns/rdata/in_1/px_26.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: px_26.c,v 1.33 2001/03/16 22:53:17 bwelling Exp $ */ +/* $Id: px_26.c,v 1.34 2001/07/16 03:06:48 marka Exp $ */ /* Reviewed: Mon Mar 20 10:44:27 PST 2000 */ @@ -37,6 +37,7 @@ fromtext_in_px(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Preference. diff --git a/lib/dns/rdata/in_1/srv_33.c b/lib/dns/rdata/in_1/srv_33.c index c85bea80..5c33bdc2 100644 --- a/lib/dns/rdata/in_1/srv_33.c +++ b/lib/dns/rdata/in_1/srv_33.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: srv_33.c,v 1.35 2001/03/16 22:53:18 bwelling Exp $ */ +/* $Id: srv_33.c,v 1.36 2001/07/16 03:06:49 marka Exp $ */ /* Reviewed: Fri Mar 17 13:01:00 PST 2000 by bwelling */ @@ -37,6 +37,7 @@ fromtext_in_srv(ARGS_FROMTEXT) { UNUSED(type); UNUSED(rdclass); + UNUSED(callbacks); /* * Priority. diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c index 8abcb4b6..d094a599 100644 --- a/lib/dns/rdata/in_1/wks_11.c +++ b/lib/dns/rdata/in_1/wks_11.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: wks_11.c,v 1.43 2001/06/21 04:00:47 marka Exp $ */ +/* $Id: wks_11.c,v 1.44 2001/07/16 03:06:51 marka Exp $ */ /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */ @@ -62,7 +62,7 @@ fromtext_in_wks(ARGS_FROMTEXT) { ISC_FALSE)); isc_buffer_availableregion(target, ®ion); - if (inet_aton(token.value.as_pointer, &addr) != 1) + if (getquad(token.value.as_pointer, &addr, lexer, callbacks) != 1) RETTOK(DNS_R_BADDOTTEDQUAD); if (region.length < 4) return (ISC_R_NOSPACE); diff --git a/lib/dns/stats.c b/lib/dns/stats.c index ca16f13d..4adf4eda 100644 --- a/lib/dns/stats.c +++ b/lib/dns/stats.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: stats.c,v 1.4 2001/01/23 01:50:28 bwelling Exp $ */ +/* $Id: stats.c,v 1.5 2001/07/16 05:10:23 mayer Exp $ */ #include <config.h> @@ -23,14 +23,15 @@ #include <dns/stats.h> -const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = { +LIBDNS_EXTERNAL_DATA const char *dns_statscounter_names[DNS_STATS_NCOUNTERS] = + { "success", "referral", "nxrrset", "nxdomain", "recursion", "failure" -}; + }; isc_result_t dns_stats_alloccounters(isc_mem_t *mctx, isc_uint64_t **ctrp) { diff --git a/lib/dns/win32/DLLMain.c b/lib/dns/win32/DLLMain.c new file mode 100644 index 00000000..9a68317e --- /dev/null +++ b/lib/dns/win32/DLLMain.c @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: DLLMain.c,v 1.3 2001/07/17 20:29:23 gson Exp $ */ + +#include <windows.h> +#include <signal.h> + +BOOL InitSockets(void); + +/* + * Called when we enter the DLL + */ +__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) { + /* + * The DLL is loading due to process + * initialization or a call to LoadLibrary. + */ + case DLL_PROCESS_ATTACH: + break; + + /* The attached process creates a new thread. */ + case DLL_THREAD_ATTACH: + break; + + /* The thread of the attached process terminates. */ + case DLL_THREAD_DETACH: + break; + + /* + * The DLL is unloading from a process due to + * process termination or a call to FreeLibrary. + */ + case DLL_PROCESS_DETACH: + break; + + default: + break; + } + return (TRUE); +} + diff --git a/lib/dns/win32/gen.dsp b/lib/dns/win32/gen.dsp new file mode 100644 index 00000000..5f6358a5 --- /dev/null +++ b/lib/dns/win32/gen.dsp @@ -0,0 +1,107 @@ +# Microsoft Developer Studio Project File - Name="gen" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=gen - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "gen.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "gen.mak" CFG="gen - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "gen - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "gen - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "gen - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Release/libisc.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "gen - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +# SUBTRACT CPP /X /YX +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib advapi32.lib ../../../lib/isc/win32/Debug/libisc.lib /nologo /subsystem:console /debug /machine:I386 /out:"../../../Build/Debug/gen.exe" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "gen - Win32 Release" +# Name "gen - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\gen.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE="..\gen-win32.h" +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/lib/dns/win32/gen.dsw b/lib/dns/win32/gen.dsw new file mode 100644 index 00000000..e4c143cc --- /dev/null +++ b/lib/dns/win32/gen.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "gen"=".\gen.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/lib/dns/win32/libdns.def b/lib/dns/win32/libdns.def new file mode 100644 index 00000000..42db163d --- /dev/null +++ b/lib/dns/win32/libdns.def @@ -0,0 +1,717 @@ +LIBRARY libdns + +; Exported Functions +EXPORTS + +dns_a6_init +dns_a6_reset +dns_a6_invalidate +dns_a6_copy +dns_a6_foreach +dns_acl_create +dns_acl_appendelement +dns_acl_any +dns_acl_none +dns_acl_attach +dns_acl_detach +dns_aclelement_equal +dns_acl_equal +dns_acl_isinsecure +dns_aclenv_init +dns_aclenv_copy +dns_aclenv_destroy +dns_acl_match +dns_aclelement_match +dns_adb_create +dns_adb_attach +dns_adb_detach +dns_adb_whenshutdown +dns_adb_shutdown +dns_adb_createfind +dns_adb_cancelfind +dns_adb_destroyfind +dns_adb_dump +dns_adb_dumpfind +dns_adb_marklame +dns_adb_adjustsrtt +dns_adb_changeflags +dns_adb_findaddrinfo +dns_adb_freeaddrinfo +dns_adb_flush +dns_byaddr_create +dns_byaddr_cancel +dns_byaddr_destroy +dns_byaddr_createptrname +dns_cache_create +dns_cache_attach +dns_cache_detach +dns_cache_attachdb +dns_cache_setfilename +dns_cache_load +dns_cache_dump +dns_cache_clean +dns_cache_setcleaninginterval +dns_cache_setcachesize +dns_cache_flush +dns_rdatacallbacks_init +dns_rdatacallbacks_init_stdio +dns_cert_fromtext +dns_cert_totext +dns_compress_init +dns_compress_invalidate +dns_compress_setmethods +dns_compress_getmethods +dns_compress_getedns +dns_compress_findglobal +dns_compress_add +dns_compress_rollback +dns_decompress_init +dns_decompress_invalidate +dns_decompress_setmethods +dns_decompress_getmethods +dns_decompress_edns +dns_decompress_type +dns_db_create +dns_db_attach +dns_db_detach +dns_db_ondestroy +dns_db_iscache +dns_db_iszone +dns_db_isstub +dns_db_issecure +dns_db_origin +dns_db_class +dns_db_beginload +dns_db_endload +dns_db_load +dns_db_dump +dns_db_currentversion +dns_db_newversion +dns_db_attachversion +dns_db_closeversion +dns_db_findnode +dns_db_find +dns_db_findzonecut +dns_db_attachnode +dns_db_detachnode +dns_db_expirenode +dns_db_printnode +dns_db_createiterator +dns_db_findrdataset +dns_db_allrdatasets +dns_db_addrdataset +dns_db_subtractrdataset +dns_db_deleterdataset +dns_db_getsoaserial +dns_db_overmem +dns_db_nodecount +dns_db_ispersistent +dns_db_register +dns_db_unregister +dns_dbiterator_destroy +dns_dbiterator_first +dns_dbiterator_last +dns_dbiterator_seek +dns_dbiterator_prev +dns_dbiterator_next +dns_dbiterator_current +dns_dbiterator_pause +dns_dbiterator_origin +dns_dbiterator_setcleanmode +dns_dbtable_create +dns_dbtable_attach +dns_dbtable_detach +dns_dbtable_add +dns_dbtable_remove +dns_dbtable_adddefault +dns_dbtable_getdefault +dns_dbtable_removedefault +dns_dbtable_find + +dns_difftuple_create +dns_difftuple_free +dns_difftuple_copy +dns_diff_init +dns_diff_clear +dns_diff_append +dns_diff_appendminimal +dns_diff_sort +dns_diff_apply +dns_diff_load +dns_diff_print +dns_dispatchmgr_create +dns_dispatchmgr_destroy +dns_dispatchmgr_setblackhole +dns_dispatchmgr_getblackhole +dns_dispatch_getudp +dns_dispatch_createtcp +dns_dispatch_attach +dns_dispatch_detach +dns_dispatch_starttcp +dns_dispatch_addresponse +dns_dispatch_removeresponse +dns_dispatch_getsocket +dns_dispatch_getlocaladdress +dns_dispatch_cancel +dns_dispatch_changeattributes +dns_dispatch_importrecv +dns_dnssec_keyfromrdata +dns_dnssec_sign +dns_dnssec_verify +dns_dnssec_findzonekeys +dns_dnssec_signmessage +dns_dnssec_verifymessage +dns_fwdtable_create +dns_fwdtable_add +dns_fwdtable_find +dns_fwdtable_destroy +dns_db_createsoatuple +dns_journal_open +dns_journal_destroy +dns_journal_begin_transaction +dns_journal_writediff +dns_journal_commit +dns_journal_writediff +dns_journal_write_transaction +dns_diff_sort +dns_journal_writediff +dns_journal_first_serial +dns_journal_last_serial +dns_journal_iter_init +dns_journal_first_rr +dns_journal_next_rr +dns_journal_iter_init +dns_journal_current_rr +dns_journal_rollforward +dns_journal_print +dns_db_diff +dns_keyflags_fromtext +dns_keytable_create +dns_keytable_attach +dns_keytable_detach +dns_keytable_add +dns_keytable_findkeynode +dns_keytable_findnextkeynode +dns_keytable_finddeepestmatch +dns_keytable_detachkeynode +dns_keytable_issecuredomain +dns_keynode_key +dns_lib_initmsgcat +dns_log_init +dns_log_setcontext +dns_lookup_create +dns_lookup_cancel +dns_lookup_destroy +dns_master_loadfile +dns_master_loadstream +dns_master_loadbuffer +dns_master_loadfileinc +dns_master_loadstreaminc +dns_master_loadbufferinc +dns_loadctx_detach +dns_loadctx_attach +dns_loadctx_cancel +dns_master_dumptostream +dns_master_dump +dns_master_rdatasettotext +dns_master_questiontotext +dns_rdataset_towire +dns_master_dumpnodetostream +dns_master_dumpnode +dns_message_gettempname +dns_message_create +dns_message_reset +dns_message_destroy +dns_message_sectiontotext +dns_message_pseudosectiontotext +dns_message_totext +dns_message_parse +dns_message_firstname +dns_message_renderbegin +dns_message_renderend +dns_message_renderchangebuffer +dns_message_renderend +dns_message_renderreserve +dns_message_renderrelease +dns_message_rendersection +dns_message_renderheader +dns_message_renderend +dns_message_renderend +dns_message_renderreset +dns_message_firstname +dns_message_nextname +dns_message_currentname +dns_message_findname +dns_message_findtype +dns_message_movename +dns_message_addname +dns_message_gettempname +dns_message_gettempoffsets +dns_message_gettemprdata +dns_message_gettemprdataset +dns_message_gettemprdatalist +dns_message_puttempname +dns_message_puttemprdata +dns_message_puttemprdataset +dns_message_puttemprdatalist +dns_message_peekheader +dns_message_reply +dns_message_getopt +dns_message_setopt +dns_message_gettsig +dns_message_settsigkey +dns_message_gettsigkey +dns_message_setquerytsig +dns_message_getquerytsig +dns_message_getsig0 +dns_message_setsig0key +dns_message_getsig0key +dns_message_takebuffer +dns_message_signer +dns_message_checksig +dns_message_getrawmessage +dns_message_setsortorder +dns_message_rendersection +dns_message_settimeadjust +dns_message_gettimeadjust +dns_label_type +dns_label_countbits +dns_label_getbit +dns_name_init +dns_name_reset +dns_name_invalidate +dns_name_setbuffer +dns_name_hasbuffer +dns_name_isabsolute +dns_name_iswildcard +dns_name_requiresedns +dns_name_hash +dns_name_fullcompare +dns_name_compare +dns_name_equal +dns_name_rdatacompare +dns_name_issubdomain +dns_name_matcheswildcard +dns_name_depth +dns_name_countlabels +dns_name_getlabel +dns_name_getlabelsequence +dns_name_clone +dns_name_fromregion +dns_name_toregion +dns_name_fromwire +dns_name_towire +dns_name_fromtext +dns_name_totext +dns_name_tofilenametext +dns_name_downcase +dns_name_concatenate +dns_name_split +dns_name_splitatdepth +dns_name_dup +dns_name_dupwithoffsets +dns_name_free +dns_name_digest +dns_name_dynamic +dns_name_print +dns_name_format +dns_name_copy +dns_ncache_add +dns_ncache_towire +dns_nxt_buildrdata +dns_nxt_build +dns_nxt_typepresent +dns_soa_getserial +dns_soa_setserial +dns_soa_getminimum +dns_peerlist_new +dns_peerlist_attach +dns_peerlist_detach +dns_peerlist_addpeer +dns_peerlist_peerbyaddr +dns_peerlist_currpeer +dns_peer_new +dns_peer_attach +dns_peer_detach +dns_peer_setbogus +dns_peer_getbogus + + +dns_peer_setrequestixfr +dns_peer_getrequestixfr +dns_peer_setprovideixfr +dns_peer_getprovideixfr +dns_peer_setsupportedns +dns_peer_getsupportedns +dns_peer_settransfers +dns_peer_gettransfers +dns_peer_settransferformat +dns_peer_gettransferformat +dns_peer_setkeybycharp +dns_peer_getkey +dns_peer_setkey +dns_name_concatenate +dns_name_totext +dns_rbt_create +dns_rbt_addname +dns_rbt_addnode +dns_rbt_findname +dns_rbt_findnode +dns_rbt_deletename +dns_rbt_deletenode +dns_rbt_namefromnode +dns_rbt_fullnamefromnode +dns_rbt_formatnodename +dns_rbt_nodecount +dns_rbt_destroy +dns_rbt_printall +dns_rbtnodechain_init +dns_rbtnodechain_reset +dns_rbtnodechain_invalidate +dns_rbtnodechain_current +dns_rbtnodechain_first +dns_rbtnodechain_last +dns_rbtnodechain_prev +dns_rbtnodechain_next +dns_rcode_fromtext +dns_rcode_totext +dns_tsigrcode_fromtext +dns_tsigrcode_totext +dns_rdata_init +dns_rdata_reset +dns_rdata_clone +dns_rdata_compare +dns_rdata_fromregion +dns_rdata_toregion +dns_rdata_fromwire +dns_rdata_towire +dns_rdata_fromtext + +dns_rdata_totext +dns_rdata_tofmttext +dns_rdata_fromstruct +dns_rdata_tostruct +dns_rdata_freestruct +dns_rdatatype_ismeta +dns_rdatatype_issingleton +dns_rdataclass_ismeta +dns_rdatatype_isdnssec +dns_rdatatype_iszonecutauth +dns_rdatatype_isknown +dns_rdata_additionaldata +dns_rdata_digest +dns_rdatatype_questiononly +dns_rdatatype_notquestion +dns_rdatatype_attributes +dns_rdata_covers +dns_rdataclass_fromtext +dns_rdataclass_totext +dns_rdataclass_format +dns_rdatalist_init +dns_rdatalist_tordataset +dns_rdataset_init +dns_rdataset_invalidate +dns_rdataset_disassociate +dns_rdataset_isassociated +dns_rdataset_makequestion +dns_rdataset_clone +dns_rdataset_count +dns_rdataset_first +dns_rdataset_next +dns_rdataset_current +dns_rdataset_totext +dns_rdataset_towire +dns_rdataset_towiresorted +dns_rdataset_additionaldata +dns_rdatasetiter_destroy +dns_rdatasetiter_first +dns_rdatasetiter_next +dns_rdatasetiter_current +dns_rdataslab_fromrdataset +dns_rdataslab_size +dns_rdataslab_merge +dns_rdataslab_subtract +dns_rdataslab_equal +dns_rdatatype_fromtext +dns_rdatatype_totext +dns_rdatatype_format +dns_requestmgr_create +dns_requestmgr_whenshutdown +dns_requestmgr_shutdown +dns_requestmgr_attach +dns_requestmgr_detach +dns_request_create +dns_request_createvia +dns_request_createraw +dns_request_cancel +dns_request_getresponse +dns_request_usedtcp +dns_request_destroy +dns_resolver_createfetch +dns_resolver_create +dns_resolver_freeze +dns_resolver_prime +dns_resolver_whenshutdown +dns_resolver_shutdown +dns_resolver_attach +dns_resolver_detach +dns_resolver_createfetch +dns_resolver_cancelfetch +dns_resolver_destroyfetch +dns_resolver_dispatchmgr +dns_resolver_dispatchv4 +dns_resolver_dispatchv6 +dns_resolver_socketmgr +dns_resolver_taskmgr +dns_resolver_getlamettl +dns_resolver_setlamettl +dns_result_totext +dns_result_register +dns_result_torcode +dns_rootns_create +dns_sdb_register +dns_sdb_unregister +dns_sdb_putrr +dns_sdb_putnamedrr +dns_sdb_putsoa +dns_secalg_fromtext +dns_secalg_totext +dns_secproto_fromtext +dns_secproto_totext +dns_ssutable_create +dns_ssutable_attach +dns_ssutable_detach +dns_ssutable_addrule +dns_ssutable_checkrules +dns_stats_alloccounters +dns_stats_freecounters +dns_tcpmsg_init +dns_tcpmsg_setmaxsize +dns_tcpmsg_readmessage +dns_tcpmsg_cancelread +dns_tcpmsg_keepbuffer +dns_tcpmsg_invalidate +dns_time64_fromtext +dns_time32_fromtext +dns_time64_totext +dns_time32_totext +dns_timer_setidle +dns_tkeyctx_create +dns_tkeyctx_destroy +dns_tkey_processquery +dns_tkey_builddhquery +dns_tkey_buildgssquery +dns_tkey_builddeletequery +dns_tkey_processdhresponse +dns_tkey_processgssresponse +dns_tkey_processdeleteresponse +dns_tsigkey_create +dns_tsigkey_createfromkey +dns_tsigkey_attach +dns_tsigkey_detach +dns_tsigkey_setdeleted +dns_tsig_sign +dns_tsig_verify +dns_tsigkey_find +dns_tsigkeyring_create +dns_tsigkeyring_destroy +dns_ttl_totext +dns_counter_fromtext +dns_ttl_fromtext +dns_validator_create +dns_validator_cancel +dns_validator_destroy +dns_view_create +dns_view_attach +dns_view_detach +dns_view_flushanddetach +dns_view_weakattach +dns_view_weakdetach +dns_view_createresolver +dns_view_setcache +dns_view_sethints +dns_view_setkeyring +dns_view_setdstport +dns_view_addzone +dns_view_freeze +dns_view_find +dns_view_simplefind +dns_view_findzonecut +dns_viewlist_find +dns_view_findzone +dns_view_load +dns_view_loadnew +dns_view_gettsig +dns_view_getpeertsig +dns_view_checksig +dns_view_dialup +dns_view_dumpdbtostream +dns_view_flushcache +dns_xfrin_create +dns_xfrin_shutdown +dns_xfrin_detach +dns_xfrin_attach +dns_zone_create +dns_zone_setclass +dns_zone_getclass +dns_zone_settype +dns_zone_setview +dns_zone_getview +dns_zone_setorigin +dns_zone_getorigin +dns_zone_setfile +dns_zone_getfile +dns_zone_load +dns_zone_attach +dns_zone_detach +dns_zone_iattach +dns_zone_idetach +dns_zone_setflag +dns_zone_getdb +dns_zone_setdbtype +dns_zone_markdirty +dns_zone_expire +dns_zone_refresh +dns_zone_flush +dns_zone_dump +dns_zone_dumptostream +dns_zone_maintenance +dns_zone_setmasters +dns_zone_setmasterswithkeys +dns_zone_setmasters +dns_zone_setalsonotify +dns_zone_unload +dns_zone_setoption + +dns_zone_getoptions +dns_zone_setminrefreshtime +dns_zone_setmaxrefreshtime +dns_zone_setminretrytime +dns_zone_setmaxretrytime +dns_zone_setxfrsource4 +dns_zone_getxfrsource4 +dns_zone_setxfrsource6 +dns_zone_getxfrsource6 +dns_zone_setnotifysrc4 +dns_zone_getnotifysrc4 +dns_zone_setnotifysrc6 +dns_zone_getnotifysrc6 +dns_zone_setnotifyacl +dns_zone_setqueryacl +dns_zone_setupdateacl +dns_zone_setforwardacl +dns_zone_setxfracl +dns_zone_getnotifyacl +dns_zone_getqueryacl +dns_zone_getupdateacl +dns_zone_getforwardacl +dns_zone_getxfracl +dns_zone_clearupdateacl +dns_zone_clearforwardacl +dns_zone_clearnotifyacl +dns_zone_clearqueryacl +dns_zone_clearxfracl +dns_zone_setchecknames +dns_zone_getchecknames +dns_zone_setjournalsize +dns_zone_getjournalsize +dns_zone_notifyreceive +dns_zone_setmaxxfrin +dns_zone_getmaxxfrin +dns_zone_setmaxxfrout +dns_zone_getmaxxfrout +dns_zone_setjournal +dns_zone_getjournal +dns_zone_gettype +dns_zone_settask +dns_zone_gettask +dns_zone_notify +dns_zone_replacedb +dns_zone_getidlein +dns_zone_setidlein +dns_zone_getidleout +dns_zone_setidleout +dns_zone_getssutable +dns_zone_setssutable +dns_zone_getmctx +dns_zone_getmgr +dns_zone_setsigvalidityinterval +dns_zone_getsigvalidityinterval +dns_zone_setnotifytype +dns_zone_forwardupdate +dns_zone_next +dns_zone_first +dns_zonemgr_create +dns_zonemgr_managezone +dns_zonemgr_forcemaint +dns_zonemgr_shutdown +dns_zonemgr_attach +dns_zonemgr_detach +dns_zonemgr_releasezone +dns_zonemgr_settransfersin +dns_zonemgr_getttransfersin +dns_zonemgr_settransfersperns +dns_zonemgr_getttransfersperns +dns_zonemgr_setiolimit +dns_zonemgr_getiolimit +dns_zonemgr_setserialqueryrate +dns_zonemgr_getserialqueryrate +dns_zonemgr_getcount +dns_zone_forcereload +dns_zone_isforced +dns_zone_setstatistics +dns_zone_getstatscounters +dns_zone_dialup +dns_zone_setdialup +dns_zone_log +dns_zonekey_iszonekey +dns_zt_create +dns_zt_mount +dns_zt_unmount +dns_zt_find +dns_zt_detach +dns_zt_flushanddetach +dns_zt_attach +dns_zt_load +dns_zt_apply +dst_lib_init +dst_lib_destroy +dst_algorithm_supported +dst_context_create +dst_context_destroy +dst_context_adddata +dst_context_sign +dst_context_verify +dst_key_computesecret +dst_key_fromfile +dst_key_fromnamedfile +dst_key_tofile +dst_key_fromdns +dst_key_todns +dst_key_frombuffer +dst_key_tobuffer +dst_key_fromgssapi +dst_key_generate +dst_key_compare +dst_key_paramcompare +dst_key_free +dst_key_name +dst_key_size +dst_key_proto +dst_key_alg +dst_key_flags +dst_key_id +dst_key_class +dst_key_isprivate +dst_key_iszonekey +dst_key_isnullkey +dst_key_buildfilename +dst_key_sigsize +dst_key_secretsize +dst_region_computeid +dst_gssapi_acquirecred +dst_gssapi_initctx +dst_gssapi_acceptctx +dst_lib_initmsgcat +dst_result_totext +dst_result_register diff --git a/lib/dns/win32/libdns.dsp b/lib/dns/win32/libdns.dsp new file mode 100644 index 00000000..bf650b6f --- /dev/null +++ b/lib/dns/win32/libdns.dsp @@ -0,0 +1,706 @@ +# Microsoft Developer Studio Project File - Name="libdns" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libdns - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libdns.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libdns.mak" CFG="libdns - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libdns - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libdns - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libdns - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/openssl/include" /I "../../dns/sec/dst/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /YX /FD /c +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libdns.dll" + +!ELSEIF "$(CFG)" == "libdns - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libdns_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../isc/win32" /I "../../isc/win32/include" /I "../../isc/include" /I "../../dns/sec/openssl/include" /I "../../dns/sec/dst/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBDNS_EXPORTS" /FR /YX /FD /GZ /c +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /map /debug /machine:I386 /out:"../../../Build/Debug/libdns.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "libdns - Win32 Release" +# Name "libdns - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# Begin Group "Main Dns Lib" + +# PROP Default_Filter "c" +# Begin Source File + +SOURCE=..\a6.c +# End Source File +# Begin Source File + +SOURCE=..\acl.c +# End Source File +# Begin Source File + +SOURCE=..\adb.c +# End Source File +# Begin Source File + +SOURCE=..\byaddr.c +# End Source File +# Begin Source File + +SOURCE=..\cache.c +# End Source File +# Begin Source File + +SOURCE=..\callbacks.c +# End Source File +# Begin Source File + +SOURCE=..\compress.c +# End Source File +# Begin Source File + +SOURCE=..\db.c +# End Source File +# Begin Source File + +SOURCE=..\dbiterator.c +# End Source File +# Begin Source File + +SOURCE=..\dbtable.c +# End Source File +# Begin Source File + +SOURCE=..\diff.c +# End Source File +# Begin Source File + +SOURCE=..\dispatch.c + +!IF "$(CFG)" == "libdns - Win32 Release" + +!ELSEIF "$(CFG)" == "libdns - Win32 Debug" + +# ADD CPP /I "../sec/dst/include" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\DLLMain.c +# End Source File +# Begin Source File + +SOURCE=..\dnssec.c +# End Source File +# Begin Source File + +SOURCE=..\forward.c +# End Source File +# Begin Source File + +SOURCE=..\journal.c +# End Source File +# Begin Source File + +SOURCE=..\keytable.c +# End Source File +# Begin Source File + +SOURCE=..\lib.c +# End Source File +# Begin Source File + +SOURCE=..\log.c +# End Source File +# Begin Source File + +SOURCE=..\lookup.c +# End Source File +# Begin Source File + +SOURCE=..\master.c +# End Source File +# Begin Source File + +SOURCE=..\masterdump.c +# End Source File +# Begin Source File + +SOURCE=..\message.c +# End Source File +# Begin Source File + +SOURCE=..\name.c +# End Source File +# Begin Source File + +SOURCE=..\ncache.c +# End Source File +# Begin Source File + +SOURCE=..\nxt.c +# End Source File +# Begin Source File + +SOURCE=..\peer.c +# End Source File +# Begin Source File + +SOURCE=..\rbt.c +# End Source File +# Begin Source File + +SOURCE=..\rbtdb.c +# End Source File +# Begin Source File + +SOURCE=..\rbtdb64.c +# End Source File +# Begin Source File + +SOURCE=..\rdata.c +# End Source File +# Begin Source File + +SOURCE=..\rdatalist.c +# End Source File +# Begin Source File + +SOURCE=..\rdataset.c +# End Source File +# Begin Source File + +SOURCE=..\rdatasetiter.c +# End Source File +# Begin Source File + +SOURCE=..\rdataslab.c +# End Source File +# Begin Source File + +SOURCE=..\request.c +# End Source File +# Begin Source File + +SOURCE=..\resolver.c +# End Source File +# Begin Source File + +SOURCE=..\result.c +# End Source File +# Begin Source File + +SOURCE=..\rootns.c +# End Source File +# Begin Source File + +SOURCE=..\sdb.c +# End Source File +# Begin Source File + +SOURCE=..\soa.c +# End Source File +# Begin Source File + +SOURCE=..\ssu.c +# End Source File +# Begin Source File + +SOURCE=..\stats.c +# End Source File +# Begin Source File + +SOURCE=..\tcpmsg.c +# End Source File +# Begin Source File + +SOURCE=..\time.c +# End Source File +# Begin Source File + +SOURCE=..\timer.c +# End Source File +# Begin Source File + +SOURCE=..\tkey.c +# End Source File +# Begin Source File + +SOURCE=..\tsig.c +# End Source File +# Begin Source File + +SOURCE=..\ttl.c +# End Source File +# Begin Source File + +SOURCE=..\validator.c +# End Source File +# Begin Source File + +SOURCE=.\version.c +# End Source File +# Begin Source File + +SOURCE=..\view.c +# End Source File +# Begin Source File + +SOURCE=..\xfrin.c +# End Source File +# Begin Source File + +SOURCE=..\zone.c +# End Source File +# Begin Source File + +SOURCE=..\zonekey.c +# End Source File +# Begin Source File + +SOURCE=..\zt.c +# End Source File +# End Group +# Begin Group "dst" + +# PROP Default_Filter "c" +# Begin Source File + +SOURCE=..\sec\dst\dst_api.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\dst_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\dst_parse.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\dst_result.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\gssapi_link.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\gssapictx.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\hmac_link.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\key.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\openssl_link.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\openssldh_link.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\openssldsa_link.c +# End Source File +# Begin Source File + +SOURCE=..\sec\dst\opensslrsa_link.c +# End Source File +# End Group +# Begin Group "openssl" + +# PROP Default_Filter "c" +# Begin Source File + +SOURCE=..\sec\openssl\a_bitstr.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_bytes.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_enum.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_gentm.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_int.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_object.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_octet.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_print.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_set.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_type.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_utctm.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_utf8.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\a_vis.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\asn1_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_add.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_asm.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_blind.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_ctx.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_div.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_err.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_exp.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_exp2.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_gcd.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_lcl.h +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_mont.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_mul.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_prime.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_prime.h +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_print.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_rand.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_recp.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_shift.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_sqr.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\bn_word.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\buffer.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\cryptlib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\cryptlib.h +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dh_err.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dh_gen.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dh_key.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dh_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_asn1.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_err.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_gen.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_key.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_ossl.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_sign.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\dsa_vrf.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\err.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\ex_data.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\lhash.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\md32_common.h +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\md5_locl.h +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\mem.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\mem_dbg.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\obj_dat.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\obj_dat.h +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\obj_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rand_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_chk.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_eay.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_gen.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_lib.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_none.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_oaep.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_pk1.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_sign.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\rsa_ssl.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\sha1_one.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\sha1dgst.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\sha_locl.h +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\stack.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\x_algor.c +# End Source File +# Begin Source File + +SOURCE=..\sec\openssl\x_sig.c +# End Source File +# End Group +# Begin Source File + +SOURCE=.\libdns.def +# End Source File +# End Target +# End Project diff --git a/lib/dns/win32/libdns.dsw b/lib/dns/win32/libdns.dsw new file mode 100644 index 00000000..c1685a0e --- /dev/null +++ b/lib/dns/win32/libdns.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libdns"=".\libdns.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/lib/dns/win32/version.c b/lib/dns/win32/version.c new file mode 100644 index 00000000..6af9e2e9 --- /dev/null +++ b/lib/dns/win32/version.c @@ -0,0 +1,26 @@ +/* + * Copyright (C) 1998-2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: version.c,v 1.1 2001/07/16 05:10:30 mayer Exp $ */ + +#include <versions.h> + +char dns_version[] = VERSION; + +unsigned int dns_libinterface = LIBINTERFACE; +unsigned int dns_librevision = LIBREVISION; +unsigned int dns_libage = LIBAGE;
\ No newline at end of file diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 0f5d1fa5..119c3619 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: zone.c,v 1.329 2001/07/11 23:15:14 marka Exp $ */ +/* $Id: zone.c,v 1.330 2001/07/17 02:49:44 marka Exp $ */ #include <config.h> @@ -560,12 +560,11 @@ zone_free(dns_zone_t *zone) { REQUIRE(isc_refcount_current(&zone->erefs) == 0); REQUIRE(zone->irefs == 0); REQUIRE(!LOCKED_ZONE(zone)); + REQUIRE(zone->timer == NULL); /* * Managed objects. Order is important. */ - if (zone->timer != NULL) - isc_timer_detach(&zone->timer); if (zone->request != NULL) dns_request_destroy(&zone->request); /* XXXMPA */ INSIST(zone->readio == NULL); @@ -1545,6 +1544,7 @@ zone_iattach(dns_zone_t *source, dns_zone_t **target) { REQUIRE(LOCKED_ZONE(source)); REQUIRE(DNS_ZONE_VALID(source)); REQUIRE(target != NULL && *target == NULL); + INSIST(source->irefs + isc_refcount_current(&source->erefs) > 0); source->irefs++; INSIST(source->irefs != 0); *target = source; @@ -3668,7 +3668,6 @@ ns_query(dns_zone_t *zone, dns_rdataset_t *soardataset, dns_stub_t *stub) { static void zone_shutdown(isc_task_t *task, isc_event_t *event) { dns_zone_t *zone = (dns_zone_t *) event->ev_arg; - isc_result_t result; isc_boolean_t free_needed; UNUSED(task); @@ -3720,9 +3719,9 @@ zone_shutdown(isc_task_t *task, isc_event_t *event) { notify_cancel(zone); if (zone->timer != NULL) { - result = isc_timer_reset(zone->timer, isc_timertype_inactive, - NULL, NULL, ISC_TRUE); - RUNTIME_CHECK(result == ISC_R_SUCCESS); + isc_timer_detach(&zone->timer); + INSIST(zone->irefs > 0); + zone->irefs--; } if (zone->view != NULL) @@ -5403,6 +5402,11 @@ dns_zonemgr_managezone(dns_zonemgr_t *zmgr, dns_zone_t *zone) { &zone->timer); if (result != ISC_R_SUCCESS) goto cleanup_task; + /* + * The timer "holds" a iref. + */ + zone->irefs++; + INSIST(zone->irefs != 0); ISC_LIST_APPEND(zmgr->zones, zone, link); zone->zmgr = zmgr; diff --git a/lib/isc/assertions.c b/lib/isc/assertions.c index 63a2a5ce..08dd5f3d 100644 --- a/lib/isc/assertions.c +++ b/lib/isc/assertions.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: assertions.c,v 1.15 2001/07/12 05:58:17 mayer Exp $ */ +/* $Id: assertions.c,v 1.16 2001/07/16 03:52:05 mayer Exp $ */ #include <config.h> @@ -36,7 +36,8 @@ default_callback(const char *, int, isc_assertiontype_t, const char *); * Public. */ -LIBISC_EXTERNAL_DATA isc_assertioncallback_t isc_assertion_failed = default_callback; +LIBISC_EXTERNAL_DATA isc_assertioncallback_t isc_assertion_failed = + default_callback; void isc_assertion_setcallback(isc_assertioncallback_t cb) { diff --git a/lib/isc/commandline.c b/lib/isc/commandline.c index 51201406..dedaf341 100644 --- a/lib/isc/commandline.c +++ b/lib/isc/commandline.c @@ -48,7 +48,7 @@ * SUCH DAMAGE. */ -/* $Id: commandline.c,v 1.14 2001/07/12 05:58:18 mayer Exp $ */ +/* $Id: commandline.c,v 1.15 2001/07/16 03:52:06 mayer Exp $ */ /* * This file was adapted from the NetBSD project's source tree, RCS ID: @@ -72,14 +72,18 @@ #include <isc/string.h> #include <isc/util.h> -LIBISC_EXTERNAL_DATA int isc_commandline_index = 1; /* Index into parent argv vector. */ -LIBISC_EXTERNAL_DATA int isc_commandline_option; /* Character checked for validity. */ - -LIBISC_EXTERNAL_DATA char *isc_commandline_argument; /* Argument associated with option. */ -LIBISC_EXTERNAL_DATA char *isc_commandline_progname; /* For printing error messages. */ - -LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_errprint = ISC_TRUE; /* Print error messages. */ -LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_reset = ISC_TRUE; /* Reset processing. */ +/* Index into parent argv vector. */ +LIBISC_EXTERNAL_DATA int isc_commandline_index = 1; +/* Character checked for validity. */ +LIBISC_EXTERNAL_DATA int isc_commandline_option; +/* Argument associated with option. */ +LIBISC_EXTERNAL_DATA char *isc_commandline_argument; +/* For printing error messages. */ +LIBISC_EXTERNAL_DATA char *isc_commandline_progname; +/* Print error messages. */ +LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_errprint = ISC_TRUE; +/* Reset processing. */ +LIBISC_EXTERNAL_DATA isc_boolean_t isc_commandline_reset = ISC_TRUE; static char endopt = '\0'; diff --git a/lib/isc/include/isc/commandline.h b/lib/isc/include/isc/commandline.h index 563063b2..1d630416 100644 --- a/lib/isc/include/isc/commandline.h +++ b/lib/isc/include/isc/commandline.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: commandline.h,v 1.8 2001/07/12 05:58:22 mayer Exp $ */ +/* $Id: commandline.h,v 1.9 2001/07/16 03:52:07 mayer Exp $ */ #ifndef ISC_COMMANDLINE_H #define ISC_COMMANDLINE_H 1 @@ -24,15 +24,18 @@ #include <isc/lang.h> #include <isc/platform.h> - -LIBISC_EXTERNAL_DATA extern int isc_commandline_index; /* Index into parent argv vector. */ -LIBISC_EXTERNAL_DATA extern int isc_commandline_option; /* Character checked for validity. */ - -LIBISC_EXTERNAL_DATA extern char *isc_commandline_argument; /* Argument associated with option. */ -LIBISC_EXTERNAL_DATA extern char *isc_commandline_progname; /* For printing error messages. */ - -LIBISC_EXTERNAL_DATA extern isc_boolean_t isc_commandline_errprint; /* Print error message. */ -LIBISC_EXTERNAL_DATA extern isc_boolean_t isc_commandline_reset; /* Reset getopt. */ +/* Index into parent argv vector. */ +LIBISC_EXTERNAL_DATA extern int isc_commandline_index; +/* Character checked for validity. */ +LIBISC_EXTERNAL_DATA extern int isc_commandline_option; +/* Argument associated with option. */ +LIBISC_EXTERNAL_DATA extern char *isc_commandline_argument; +/* For printing error messages. */ +LIBISC_EXTERNAL_DATA extern char *isc_commandline_progname; +/* Print error message. */ +LIBISC_EXTERNAL_DATA extern isc_boolean_t isc_commandline_errprint; +/* Reset getopt. */ +LIBISC_EXTERNAL_DATA extern isc_boolean_t isc_commandline_reset; ISC_LANG_BEGINDECLS diff --git a/lib/isc/include/isc/file.h b/lib/isc/include/isc/file.h index 5b89efce..649fef45 100644 --- a/lib/isc/include/isc/file.h +++ b/lib/isc/include/isc/file.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: file.h,v 1.20 2001/06/08 21:53:48 tale Exp $ */ +/* $Id: file.h,v 1.24 2001/07/16 18:33:00 gson Exp $ */ #ifndef ISC_FILE_H #define ISC_FILE_H 1 @@ -185,6 +185,13 @@ isc_file_iscurrentdir(const char *filename); * Return ISC_TRUE iff the given file name is the current directory ("."). */ +isc_boolean_t +isc_file_ischdiridempotent(const char *filename); +/* + * Return ISC_TRUE if calling chdir(filename) multiple times will give + * the same result as calling it once. + */ + const char * isc_file_basename(const char *filename); /* @@ -222,6 +229,12 @@ isc_file_renameunique(const char *file, char *templet); * Rename 'file' using 'templet' as a template for the new file name. */ +isc_result_t +isc_file_absolutepath(const char *filename, char *path, size_t pathlen); +/* + * Given a file name, return the fully qualified path to the file. + */ + /* * XXX We should also have a isc_file_writeeopen() function * for safely open a file in a publicly writable directory diff --git a/lib/isc/inet_pton.c b/lib/isc/inet_pton.c index 4db382c6..789403dc 100644 --- a/lib/isc/inet_pton.c +++ b/lib/isc/inet_pton.c @@ -17,7 +17,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char rcsid[] = - "$Id: inet_pton.c,v 1.9 2001/01/09 21:56:09 bwelling Exp $"; + "$Id: inet_pton.c,v 1.10 2001/07/16 03:06:52 marka Exp $"; #endif /* LIBC_SCCS and not lint */ #include <config.h> @@ -96,10 +96,12 @@ inet_pton4(src, dst) if ((pch = strchr(digits, ch)) != NULL) { unsigned int new = *tp * 10 + (pch - digits); + if (saw_digit && *tp == 0) + return (0); if (new > 255) return (0); *tp = new; - if (! saw_digit) { + if (!saw_digit) { if (++octets > 4) return (0); saw_digit = 1; diff --git a/lib/isc/mem.c b/lib/isc/mem.c index 9eb6184d..bae9a995 100644 --- a/lib/isc/mem.c +++ b/lib/isc/mem.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: mem.c,v 1.97 2001/07/12 05:58:20 mayer Exp $ */ +/* $Id: mem.c,v 1.98 2001/07/17 10:02:46 marka Exp $ */ #include <config.h> @@ -182,11 +182,12 @@ struct isc_mempool { #define ADD_TRACE(a, b, c, d, e) #define DELETE_TRACE(a, b, c, d, e) #else -#define ADD_TRACE(a, b, c, d, e) add_trace_entry(a, b, c, d, e) +#define ADD_TRACE(a, b, c, d, e) \ + do { if (b != NULL) add_trace_entry(a, b, c, d, e); } while (0) #define DELETE_TRACE(a, b, c, d, e) delete_trace_entry(a, b, c, d, e) #define MEM_TRACE ((isc_mem_debugging & ISC_MEM_DEBUGTRACE) != 0) -#define MEM_RECORD ((ctx->debugging & ISC_MEM_DEBUGRECORD) != 0) +#define MEM_RECORD ((mctx->debugging & ISC_MEM_DEBUGRECORD) != 0) static void print_active(isc_mem_t *ctx, FILE *out); @@ -983,7 +984,8 @@ isc__mem_get(isc_mem_t *ctx, size_t size FLARG) { #else /* ISC_MEM_USE_INTERNAL_MALLOC */ ptr = mem_get(ctx, size); LOCK(&ctx->lock); - mem_getstats(ctx, size); + if (ptr) + mem_getstats(ctx, size); #endif /* ISC_MEM_USE_INTERNAL_MALLOC */ ADD_TRACE(ctx, ptr, size, file, line); @@ -1047,7 +1049,7 @@ isc__mem_put(isc_mem_t *ctx, void *ptr, size_t size FLARG) #if ISC_MEM_TRACKLINES static void -print_active(isc_mem_t *ctx, FILE *out) { +print_active(isc_mem_t *mctx, FILE *out) { if (MEM_RECORD) { debuglink_t *dl; unsigned int i; @@ -1056,7 +1058,7 @@ print_active(isc_mem_t *ctx, FILE *out) { ISC_MSG_DUMPALLOC, "Dump of all outstanding " "memory allocations:\n")); - dl = ISC_LIST_HEAD(ctx->debuglist); + dl = ISC_LIST_HEAD(mctx->debuglist); if (dl == NULL) fprintf(out, isc_msgcat_get(isc_msgcat, ISC_MSGSET_MEM, ISC_MSG_NONE, @@ -1187,7 +1189,8 @@ isc__mem_allocate(isc_mem_t *ctx, size_t size FLARG) { #else /* ISC_MEM_USE_INTERNAL_MALLOC */ si = isc__mem_allocateunlocked(ctx, size); LOCK(&ctx->lock); - mem_getstats(ctx, si[-1].u.size); + if (si != NULL) + mem_getstats(ctx, si[-1].u.size); #endif /* ISC_MEM_USE_INTERNAL_MALLOC */ #if ISC_MEM_TRACKLINES diff --git a/lib/isc/unix/entropy.c b/lib/isc/unix/entropy.c index 67e39f50..c1c48b0b 100644 --- a/lib/isc/unix/entropy.c +++ b/lib/isc/unix/entropy.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: entropy.c,v 1.59 2001/06/21 14:19:19 tale Exp $ */ +/* $Id: entropy.c,v 1.60 2001/07/18 01:31:13 gson Exp $ */ /* * This is the system depenedent part of the ISC entropy API. @@ -34,6 +34,8 @@ #include <sys/select.h> #endif +#include "errno2result.h" + /* * There is only one variable in the entropy data structures that is not * system independent, but pulling the structure that uses it into this file @@ -296,7 +298,7 @@ isc_entropy_createfilesource(isc_entropy_t *ent, const char *fname) { fd = open(fname, O_RDONLY | O_NONBLOCK, 0); if (fd < 0) { - ret = ISC_R_IOERROR; + ret = isc__errno2result(errno); goto errout; } ret = make_nonblock(fd); diff --git a/lib/isc/unix/file.c b/lib/isc/unix/file.c index b145130b..da002828 100644 --- a/lib/isc/unix/file.c +++ b/lib/isc/unix/file.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: file.c,v 1.36 2001/07/10 04:23:01 bwelling Exp $ */ +/* $Id: file.c,v 1.38 2001/07/16 18:33:01 gson Exp $ */ #include <config.h> @@ -28,6 +28,7 @@ #include <sys/stat.h> #include <sys/time.h> +#include <isc/dir.h> #include <isc/file.h> #include <isc/string.h> #include <isc/time.h> @@ -260,6 +261,16 @@ isc_file_iscurrentdir(const char *filename) { return (ISC_TF(filename[0] == '.' && filename[1] == '\0')); } +isc_boolean_t +isc_file_ischdiridempotent(const char *filename) { + REQUIRE(filename != NULL); + if (isc_file_isabsolute(filename)) + return (ISC_TRUE); + if (isc_file_iscurrentdir(filename)) + return (ISC_TRUE); + return (ISC_FALSE); +} + const char * isc_file_basename(const char *filename) { char *s; @@ -290,3 +301,15 @@ isc_file_progname(const char *filename, char *buf, size_t buflen) { return (ISC_R_SUCCESS); } + +isc_result_t +isc_file_absolutepath(const char *filename, char *path, size_t pathlen) { + isc_result_t result; + result = isc_dir_current(path, pathlen, ISC_TRUE); + if (result != ISC_R_SUCCESS) + return (result); + if (strlen(path) + strlen(filename) + 1 > pathlen) + return (ISC_R_NOSPACE); + strcat(path, filename); + return (ISC_R_SUCCESS); +} diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h index 29d69488..9b51c493 100644 --- a/lib/isc/unix/include/isc/net.h +++ b/lib/isc/unix/include/isc/net.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: net.h,v 1.30 2001/07/09 08:07:41 marka Exp $ */ +/* $Id: net.h,v 1.31 2001/07/16 03:06:53 marka Exp $ */ #ifndef ISC_NET_H #define ISC_NET_H 1 @@ -252,6 +252,7 @@ isc_net_ntop(int af, const void *src, char *dst, size_t size); #ifdef ISC_PLATFORM_NEEDPTON int isc_net_pton(int af, const char *src, void *dst); +#undef inet_pton #define inet_pton isc_net_pton #endif diff --git a/lib/isc/unix/resource.c b/lib/isc/unix/resource.c index c8c4656f..17742899 100644 --- a/lib/isc/unix/resource.c +++ b/lib/isc/unix/resource.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resource.c,v 1.10 2001/01/23 06:00:11 marka Exp $ */ +/* $Id: resource.c,v 1.11 2001/07/14 01:55:08 gson Exp $ */ #include <config.h> @@ -30,10 +30,6 @@ #include "errno2result.h" -#ifndef HAVE_RLIM_T -typedef ISC_PLATFORM_RLIMITTYPE rlim_t; -#endif - static isc_result_t resource2rlim(isc_resource_t resource, int *rlim_resource) { isc_result_t result = ISC_R_SUCCESS; @@ -100,7 +96,7 @@ resource2rlim(isc_resource_t resource, int *rlim_resource) { isc_result_t isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) { struct rlimit rl; - rlim_t rlim_value; + ISC_PLATFORM_RLIMITTYPE rlim_value; int unixresult; int unixresource; isc_result_t result; @@ -117,17 +113,18 @@ isc_resource_setlimit(isc_resource_t resource, isc_resourcevalue_t value) { * isc_resourcevalue_t was chosen as an unsigned 64 bit * integer so that it could contain the maximum range of * reasonable values. Unfortunately, this exceeds the typical - * range on Unix systems. Ensure the value of rlim_t is not - * overflowed. + * range on Unix systems. Ensure the range of + * ISC_PLATFORM_RLIMITTYPE is not overflowed. */ isc_resourcevalue_t rlim_max; isc_boolean_t rlim_t_is_signed = - ISC_TF(((double)(rlim_t)-1) < 0); + ISC_TF(((double)(ISC_PLATFORM_RLIMITTYPE)-1) < 0); if (rlim_t_is_signed) - rlim_max = ~((rlim_t)1 << (sizeof(rlim_t) * 8 - 1)); + rlim_max = ~((ISC_PLATFORM_RLIMITTYPE)1 << + (sizeof(ISC_PLATFORM_RLIMITTYPE) * 8 - 1)); else - rlim_max = (rlim_t)-1; + rlim_max = (ISC_PLATFORM_RLIMITTYPE)-1; if (value > rlim_max) value = rlim_max; diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 17ae179a..2690e51c 100644 --- a/lib/isc/unix/socket.c +++ b/lib/isc/unix/socket.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.203 2001/07/09 21:06:01 gson Exp $ */ +/* $Id: socket.c,v 1.204 2001/07/15 22:50:24 gson Exp $ */ #include <config.h> @@ -1687,14 +1687,17 @@ internal_accept(isc_task_t *me, isc_event_t *ev) { /* * Try to accept the new connection. If the accept fails with * EAGAIN or EINTR, simply poke the watcher to watch this socket - * again. + * again. Also ignore ECONNRESET, which has been reported to + * be spuriously returned on Linux 2.2.19 although it is not + * a documented error for accept(). */ + addrlen = sizeof dev->newsocket->address.type; memset(&dev->newsocket->address.type.sa, 0, addrlen); fd = accept(sock->fd, &dev->newsocket->address.type.sa, (void *)&addrlen); if (fd < 0) { - if (SOFT_ERROR(errno)) { + if (SOFT_ERROR(errno) || errno == ECONNRESET) { goto soft_error; } else { UNEXPECTED_ERROR(__FILE__, __LINE__, diff --git a/lib/isc/win32/DLLMain.c b/lib/isc/win32/DLLMain.c index 4f366658..47da0fe4 100644 --- a/lib/isc/win32/DLLMain.c +++ b/lib/isc/win32/DLLMain.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: DLLMain.c,v 1.2 2001/07/08 05:08:54 mayer Exp $ */ +/* $Id: DLLMain.c,v 1.3 2001/07/17 19:16:55 gson Exp $ */ #include <windows.h> #include <stdio.h> @@ -29,7 +29,6 @@ void isc_time_initepoch(); __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - switch (fdwReason) { /* @@ -60,6 +59,6 @@ __declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, default: break; } - return (TRUE); + return (TRUE); } diff --git a/lib/isc/win32/errno2result.c b/lib/isc/win32/errno2result.c index 4189320e..5e1acdb3 100644 --- a/lib/isc/win32/errno2result.c +++ b/lib/isc/win32/errno2result.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: errno2result.c,v 1.3 2001/07/09 21:06:04 gson Exp $ */ +/* $Id: errno2result.c,v 1.4 2001/07/17 20:29:24 gson Exp $ */ #include <config.h> diff --git a/lib/isc/win32/errno2result.h b/lib/isc/win32/errno2result.h index 368167cf..51645b38 100644 --- a/lib/isc/win32/errno2result.h +++ b/lib/isc/win32/errno2result.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: errno2result.h,v 1.3 2001/07/09 21:06:05 gson Exp $ */ +/* $Id: errno2result.h,v 1.4 2001/07/17 20:29:25 gson Exp $ */ #ifndef UNIX_ERRNO2RESULT_H #define UNIX_ERRNO2RESULT_H 1 diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c index 36a13899..790c3439 100644 --- a/lib/isc/win32/file.c +++ b/lib/isc/win32/file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: file.c,v 1.15 2001/07/12 05:58:26 mayer Exp $ */ +/* $Id: file.c,v 1.20 2001/07/17 20:29:26 gson Exp $ */ #include <config.h> @@ -389,9 +389,9 @@ isc_file_isabsolute(const char *filename) { */ if ((filename[0] == '\\') && (filename[1] == '\\')) return (ISC_TRUE); - if (isalpha(filename[0]) != 0 && filename[1] == ':' && filename[2] == '\\') + if (isalpha(filename[0]) && filename[1] == ':' && filename[2] == '\\') return (ISC_TRUE); - if (isalpha(filename[0]) != 0 && filename[1] == ':' && filename[2] == '/') + if (isalpha(filename[0]) && filename[1] == ':' && filename[2] == '/') return (ISC_TRUE); return (ISC_FALSE); } @@ -402,6 +402,21 @@ isc_file_iscurrentdir(const char *filename) { return (ISC_TF(filename[0] == '.' && filename[1] == '\0')); } +isc_boolean_t +isc_file_ischdiridempotent(const char *filename) { + REQUIRE(filename != NULL); + + if (isc_file_isabsolute(filename)) + return (ISC_TRUE); + if (filename[0] == '\\') + return (ISC_TRUE); + if (filename[0] == '/') + return (ISC_TRUE); + if (isc_file_iscurrentdir(filename)) + return (ISC_TRUE); + return (ISC_FALSE); +} + const char * isc_file_basename(const char *filename) { char *s; @@ -454,3 +469,22 @@ isc_file_progname(const char *filename, char *progname, size_t namelen) { progname[len] = '\0'; return (ISC_R_SUCCESS); } + +isc_result_t +isc_file_absolutepath(const char *filename, char *path, size_t pathlen) { + char *ptrname; + DWORD retval; + + REQUIRE(filename != NULL); + REQUIRE(path != NULL); + + retval = GetFullPathName(filename, pathlen, path, &ptrname); + + /* Something went wrong in getting the path */ + if (retval == 0) + return (ISC_R_NOTFOUND); + /* Caller needs to provide a larger buffer to contain the string */ + if (retval >= pathlen) + return (ISC_R_NOSPACE); + return (ISC_R_SUCCESS); +} diff --git a/lib/isc/win32/include/isc/ipv6.h b/lib/isc/win32/include/isc/ipv6.h index 264ccde1..000e9ff6 100644 --- a/lib/isc/win32/include/isc/ipv6.h +++ b/lib/isc/win32/include/isc/ipv6.h @@ -15,6 +15,8 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/* $Id: ipv6.h,v 1.9 2001/07/17 20:29:33 gson Exp $ */ + #ifndef ISC_IPV6_H #define ISC_IPV6_H 1 diff --git a/lib/isc/win32/include/isc/keyboard.h b/lib/isc/win32/include/isc/keyboard.h index 5af77dfc..6ff49b6c 100644 --- a/lib/isc/win32/include/isc/keyboard.h +++ b/lib/isc/win32/include/isc/keyboard.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keyboard.h,v 1.2 2001/07/08 05:09:27 mayer Exp $ */ +/* $Id: keyboard.h,v 1.3 2001/07/17 20:29:34 gson Exp $ */ #ifndef ISC_KEYBOARD_H #define ISC_KEYBOARD_H 1 diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h index 3731b38c..9c960973 100644 --- a/lib/isc/win32/include/isc/net.h +++ b/lib/isc/win32/include/isc/net.h @@ -15,11 +15,19 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: net.h,v 1.14 2001/07/08 05:09:29 mayer Exp $ */ +/* $Id: net.h,v 1.15 2001/07/16 03:52:13 mayer Exp $ */ #ifndef ISC_NET_H #define ISC_NET_H 1 +/* + * Also define LWRES_IPV6_H to keep it from being included if liblwres is + * being used, or redefinition errors will occur. + */ +#define LWRES_IPV6_H 1 + + + /***** ***** Module Info *****/ diff --git a/lib/isc/win32/include/isc/ntfile.h b/lib/isc/win32/include/isc/ntfile.h index fd0955d2..9fe77bc1 100644 --- a/lib/isc/win32/include/isc/ntfile.h +++ b/lib/isc/win32/include/isc/ntfile.h @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ntfile.h,v 1.4 2001/07/09 21:34:43 gson Exp $ */ +/* $Id: ntfile.h,v 1.5 2001/07/16 03:52:14 mayer Exp $ */ #ifndef ISC_NTFILE_H #define ISC_NTFILE_H 1 @@ -29,6 +29,50 @@ * be just the one iov to deal with. */ +/* + * Outside of lib isc we need to redefine these functions + * This is due to the way _iob is set up. + * liblwres should not use this. + */ + +#if !defined(LIBISC_EXPORTS) && !defined(LIBLWRES_EXPORTS) + +#undef fdopen +#undef getc + +#define fopen isc_ntfile_fopen +#define fclose isc_ntfile_fclose +#define fwrite isc_ntfile_fwrite +#define fread isc_ntfile_fread +#define fseek isc_ntfile_fseek +#define fflush isc_ntfile_flush +#define fsync isc_ntfile_sync +#define printf isc_ntfile_printf +#define fprintf isc_ntfile_fprintf +#define vfprintf isc_ntfile_vfprintf +#define getc isc_ntfile_getc +#define fgetc isc_ntfile_fgetc +#define fgets isc_ntfile_fgets +#define fputc isc_ntfile_fputc +#define fputs isc_ntfile_fputs +#define fgetpos isc_ntfile_fgetpos +#define freopen isc_ntfile_freopen +#define fdopen isc_ntfile_fdopen +#define open isc_ntfile_open +#define close isc_ntfile_close +#define read isc_ntfile_read +#define write isc_ntfile_write + +#undef stdin +#undef stdout +#undef stderr + +#define stdin isc_ntfile_getaddress(0) +#define stdout isc_ntfile_getaddress(1) +#define stderr isc_ntfile_getaddress(2) + +#endif + FILE* isc_ntfile_fopen(const char *filename, const char *mode); diff --git a/lib/isc/win32/interfaceiter.c b/lib/isc/win32/interfaceiter.c index 97ecd06a..77950f42 100644 --- a/lib/isc/win32/interfaceiter.c +++ b/lib/isc/win32/interfaceiter.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999, 2000 Internet Software Consortium. + * Copyright (C) 1999-2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: interfaceiter.c,v 1.3 2001/07/09 21:06:09 gson Exp $ */ +/* $Id: interfaceiter.c,v 1.4 2001/07/17 20:29:27 gson Exp $ */ /* * Note that this code will need to be revisited to support IPv6 Interfaces. diff --git a/lib/isc/win32/keyboard.c b/lib/isc/win32/keyboard.c index 8b0d14a3..fd70333e 100644 --- a/lib/isc/win32/keyboard.c +++ b/lib/isc/win32/keyboard.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2001 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keyboard.c,v 1.3 2001/07/09 21:06:11 gson Exp $ */ +/* $Id: keyboard.c,v 1.4 2001/07/17 20:29:28 gson Exp $ */ #include <config.h> diff --git a/lib/isc/win32/libisc.def b/lib/isc/win32/libisc.def index cb16b7d5..363b4779 100644 --- a/lib/isc/win32/libisc.def +++ b/lib/isc/win32/libisc.def @@ -78,6 +78,7 @@ isc_file_renameunique isc_file_basename isc_file_progname isc_file_safemovefile +isc_file_getabsolutepath isc_fsaccess_add isc_fsaccess_remove isc_fsaccess_set diff --git a/lib/isc/win32/ntfile.c b/lib/isc/win32/ntfile.c index e99d0fb3..b0c4b48c 100644 --- a/lib/isc/win32/ntfile.c +++ b/lib/isc/win32/ntfile.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ntfile.c,v 1.3 2001/07/09 21:06:14 gson Exp $ */ +/* $Id: ntfile.c,v 1.5 2001/07/16 04:09:45 gson Exp $ */ /* * This file has been necessitated by the fact that the iov array is local @@ -30,6 +30,8 @@ #include <io.h> +#include <isc/ntfile.h> + FILE * isc_ntfile_fopen(const char *filename, const char *mode) { return (fopen(filename, mode)); diff --git a/lib/isc/win32/os.c b/lib/isc/win32/os.c index ddf5751c..41190987 100644 --- a/lib/isc/win32/os.c +++ b/lib/isc/win32/os.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2001 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: os.c,v 1.3 2001/07/09 21:06:17 gson Exp $ */ +/* $Id: os.c,v 1.4 2001/07/17 20:29:30 gson Exp $ */ #include <windows.h> diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c index 601ec503..b1e09859 100644 --- a/lib/isc/win32/socket.c +++ b/lib/isc/win32/socket.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2001 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: socket.c,v 1.4 2001/07/10 06:27:44 mayer Exp $ */ +/* $Id: socket.c,v 1.5 2001/07/17 20:29:31 gson Exp $ */ #define MAKE_EXTERNAL 1 diff --git a/lib/isc/win32/stdio.c b/lib/isc/win32/stdio.c index 27da10cb..c2fc6add 100644 --- a/lib/isc/win32/stdio.c +++ b/lib/isc/win32/stdio.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: stdio.c,v 1.2 2001/07/08 05:09:13 mayer Exp $ */ +/* $Id: stdio.c,v 1.3 2001/07/17 20:29:32 gson Exp $ */ #include <config.h> diff --git a/lib/isccc/win32/DLLMain.c b/lib/isccc/win32/DLLMain.c new file mode 100644 index 00000000..4d343e8d --- /dev/null +++ b/lib/isccc/win32/DLLMain.c @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: DLLMain.c,v 1.3 2001/07/17 19:16:59 gson Exp $ */ + +#include <windows.h> +#include <signal.h> + +BOOL InitSockets(void); + +/* + * Called when we enter the DLL + */ +__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) { + /* + * The DLL is loading due to process + * initialization or a call to LoadLibrary. + */ + case DLL_PROCESS_ATTACH: + break; + + /* The attached process creates a new thread. */ + case DLL_THREAD_ATTACH: + break; + + /* The thread of the attached process terminates. */ + case DLL_THREAD_DETACH: + break; + + /* + * The DLL is unloading from a process due to + * process termination or a call to FreeLibrary. + */ + case DLL_PROCESS_DETACH: + break; + + default: + break; + } + return (TRUE); +} + diff --git a/lib/isccc/win32/libisccc.def b/lib/isccc/win32/libisccc.def new file mode 100644 index 00000000..5d32a528 --- /dev/null +++ b/lib/isccc/win32/libisccc.def @@ -0,0 +1,66 @@ +LIBRARY libisccc + +; Exported Functions +EXPORTS + +isccc_alist_create +isccc_alist_alistp +isccc_alist_emptyp +isccc_alist_first +isccc_alist_assq +isccc_alist_delete +isccc_alist_define +isccc_alist_definestring +isccc_alist_definebinary +isccc_alist_lookup +isccc_alist_lookupstring +isccc_alist_lookupbinary +isccc_alist_prettyprint +isccc_base64_encode +isccc_base64_decode +isccc_cc_towire +isccc_cc_fromwire +isccc_cc_createmessage +isccc_cc_createack +isccc_cc_isack +isccc_cc_isreply +isccc_cc_createresponse +isccc_cc_definestring +isccc_cc_defineuint32 +isccc_cc_lookupstring +isccc_cc_lookupuint32 +isccc_cc_createsymtab +isccc_cc_cleansymtab +isccc_cc_checkdup +isccc_ccmsg_init +isccc_ccmsg_setmaxsize +isccc_ccmsg_readmessage +isccc_ccmsg_cancelread +isccc_ccmsg_invalidate +isccc_lib_initmsgcat +isccc_result_totext +isccc_result_register +isccc_sexpr_cons +isccc_sexpr_tconst +isccc_sexpr_fromstring +isccc_sexpr_frombinary +isccc_sexpr_free +isccc_sexpr_print +isccc_sexpr_car +isccc_sexpr_cdr +isccc_sexpr_setcar +isccc_sexpr_setcdr +isccc_sexpr_addtolist +isccc_sexpr_listp +isccc_sexpr_emptyp +isccc_sexpr_stringp +isccc_sexpr_binaryp +isccc_sexpr_tostring +isccc_sexpr_tobinary +isccc_symtab_destroy +isccc_symtab_create +isccc_symtab_destroy +isccc_symtab_lookup +isccc_symtab_define +isccc_symtab_undefine +isccc_symtab_foreach diff --git a/lib/isccc/win32/libisccc.dsp b/lib/isccc/win32/libisccc.dsp new file mode 100644 index 00000000..7852ddd8 --- /dev/null +++ b/lib/isccc/win32/libisccc.dsp @@ -0,0 +1,197 @@ +# Microsoft Developer Studio Project File - Name="libisccc" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libisccc - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libisccc.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libisccc.mak" CFG="libisccc - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libisccc - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libisccc - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libisccc - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /I "../../../lib/dns/sec/dst/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /YX /FD /c +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccc.dll" + +!ELSEIF "$(CFG)" == "libisccc - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccc_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /I "../..../lib/dns/sec/openssl/include" /I "../../../lib/dns/sec/dst/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCC_EXPORTS" /FR /YX /FD /GZ /c +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccc.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "libisccc - Win32 Release" +# Name "libisccc - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\alist.c +# End Source File +# Begin Source File + +SOURCE=..\base64.c +# End Source File +# Begin Source File + +SOURCE=..\cc.c +# End Source File +# Begin Source File + +SOURCE=..\ccmsg.c +# End Source File +# Begin Source File + +SOURCE=.\DLLMain.c +# End Source File +# Begin Source File + +SOURCE=..\lib.c +# End Source File +# Begin Source File + +SOURCE=..\result.c +# End Source File +# Begin Source File + +SOURCE=..\sexpr.c +# End Source File +# Begin Source File + +SOURCE=..\symtab.c +# End Source File +# Begin Source File + +SOURCE=.\version.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\isccc\alist.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\base64.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\cc.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\ccmsg.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\events.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\lib.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\result.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\sexpr.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\symtab.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\symtype.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\types.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccc\util.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# Begin Source File + +SOURCE=.\libisccc.def +# End Source File +# End Target +# End Project diff --git a/lib/isccc/win32/libisccc.dsw b/lib/isccc/win32/libisccc.dsw new file mode 100644 index 00000000..3bcecf04 --- /dev/null +++ b/lib/isccc/win32/libisccc.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libisccc"=.\libisccc.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/lib/isccc/win32/version.c b/lib/isccc/win32/version.c new file mode 100644 index 00000000..ceff0fef --- /dev/null +++ b/lib/isccc/win32/version.c @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: version.c,v 1.2 2001/07/17 20:29:35 gson Exp $ */ + +#include <versions.h> + +char isccc_version[] = VERSION; + +unsigned int isccc_libinterface = LIBINTERFACE; +unsigned int isccc_librevision = LIBREVISION; +unsigned int isccc_libage = LIBAGE; diff --git a/lib/isccfg/win32/DLLMain.c b/lib/isccfg/win32/DLLMain.c new file mode 100644 index 00000000..a79bcf6b --- /dev/null +++ b/lib/isccfg/win32/DLLMain.c @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: DLLMain.c,v 1.3 2001/07/17 20:29:36 gson Exp $ */ + +#include <windows.h> +#include <signal.h> + +BOOL InitSockets(void); + +/* + * Called when we enter the DLL + */ +__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + /* + * The DLL is loading due to process + * initialization or a call to LoadLibrary. + */ + case DLL_PROCESS_ATTACH: + break; + + /* + * The attached process creates a new thread. + */ + case DLL_THREAD_ATTACH: + break; + + /* The thread of the attached process terminates. */ + case DLL_THREAD_DETACH: + break; + + /* + * The DLL is unloading from a process due to + * process termination or a call to FreeLibrary. + */ + case DLL_PROCESS_DETACH: + break; + + default: + break; + } + return (TRUE); +} + diff --git a/lib/isccfg/win32/libisccfg.def b/lib/isccfg/win32/libisccfg.def new file mode 100644 index 00000000..19dbe86f --- /dev/null +++ b/lib/isccfg/win32/libisccfg.def @@ -0,0 +1,43 @@ +LIBRARY libisccfg + +; Exported Functions +EXPORTS + +cfg_parser_create +cfg_parser_setcallback +cfg_parse_file +cfg_parse_buffer +cfg_parser_destroy +cfg_obj_isvoid +cfg_obj_ismap +cfg_map_get +cfg_map_getname +cfg_obj_istuple +cfg_tuple_get +cfg_obj_isuint32 +cfg_obj_asuint32 +cfg_obj_isuint64 +cfg_obj_asuint64 +cfg_obj_isstring +cfg_obj_asstring +cfg_obj_isboolean +cfg_obj_asboolean +cfg_obj_issockaddr +cfg_obj_assockaddr +cfg_obj_isnetprefix +cfg_obj_asnetprefix +cfg_obj_islist +cfg_list_first +cfg_list_next +cfg_listelt_value +cfg_obj_istype +cfg_obj_destroy +cfg_obj_log +cfg_check_namedconf +cfg_log_init + + + +; Exported Data + +;cfg_type_rndcconf diff --git a/lib/isccfg/win32/libisccfg.dsp b/lib/isccfg/win32/libisccfg.dsp new file mode 100644 index 00000000..1abdcf3e --- /dev/null +++ b/lib/isccfg/win32/libisccfg.dsp @@ -0,0 +1,141 @@ +# Microsoft Developer Studio Project File - Name="libisccfg" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libisccfg - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libisccfg.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libisccfg.mak" CFG="libisccfg - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libisccfg - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libisccfg - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libisccfg - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /I "../../../lib/dns/sec/dst/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__STDC__" /D "_MBCS" /D "_USRDLL" /D "USE_MD5" /D "OPENSSL" /D "DST_USE_PRIVATE_OPENSSL" /D "LIBISCCFG_EXPORTS" /YX /FD /c +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccfg.dll" + +!ELSEIF "$(CFG)" == "libisccfg - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "libisccfg_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/isc/include" /I "../../../lib/dns/win32/include" /I "../../../lib/dns/include" /I "../..../lib/dns/sec/openssl/include" /I "../../../lib/dns/sec/dst/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBISCCFG_EXPORTS" /FR /YX /FD /GZ /c +# SUBTRACT CPP /X +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "libisccfg - Win32 Release" +# Name "libisccfg - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\check.c +# End Source File +# Begin Source File + +SOURCE=.\DLLMain.c +# End Source File +# Begin Source File + +SOURCE=..\log.c +# End Source File +# Begin Source File + +SOURCE=..\parser.c +# End Source File +# Begin Source File + +SOURCE=.\version.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=..\include\isccfg\cfg.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccfg\check.h +# End Source File +# Begin Source File + +SOURCE=..\include\isccfg\log.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# Begin Source File + +SOURCE=.\libisccfg.def +# End Source File +# End Target +# End Project diff --git a/lib/isccfg/win32/libisccfg.dsw b/lib/isccfg/win32/libisccfg.dsw new file mode 100644 index 00000000..ccc8711e --- /dev/null +++ b/lib/isccfg/win32/libisccfg.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libisccfg"=".\libisccfg.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/lib/isccfg/win32/version.c b/lib/isccfg/win32/version.c new file mode 100644 index 00000000..ead76805 --- /dev/null +++ b/lib/isccfg/win32/version.c @@ -0,0 +1,26 @@ +/* + * Copyright (C) 1998-2001 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM + * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL + * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING + * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, + * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION + * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: version.c,v 1.1 2001/07/16 05:48:16 mayer Exp $ */ + +#include <versions.h> + +char cfg_version[] = VERSION; + +unsigned int cfg_libinterface = LIBINTERFACE; +unsigned int cfg_librevision = LIBREVISION; +unsigned int cfg_libage = LIBAGE; diff --git a/lib/lwres/include/lwres/Makefile.in b/lib/lwres/include/lwres/Makefile.in index 7d077a27..d1c3fec5 100644 --- a/lib/lwres/include/lwres/Makefile.in +++ b/lib/lwres/include/lwres/Makefile.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.16 2001/07/11 21:42:25 gson Exp $ +# $Id: Makefile.in,v 1.17 2001/07/14 18:41:33 bwelling Exp $ srcdir = @srcdir@ VPATH = @srcdir@ @@ -24,7 +24,7 @@ top_srcdir = @top_srcdir@ # machine generated. The latter are handled specially in the # install target below. # -HEADERS = context.h lwbuffer.h lwpacket.h result.h \ +HEADERS = context.h lwbuffer.h lwpacket.h lwres.h result.h \ int.h lang.h list.h ipv6.h SUBDIRS = @@ -1,4 +1,4 @@ -# $Id: version,v 1.23 2001/07/12 17:40:17 gson Exp $ +# $Id: version,v 1.24 2001/07/17 19:21:43 gson Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=2 PATCHVER=0 -RELEASETYPE=a -RELEASEVER=3 +RELEASETYPE=b +RELEASEVER=1 |