diff options
80 files changed, 2739 insertions, 1188 deletions
@@ -1,4 +1,26 @@ + --- 9.2.2 released --- + +1428. [port] hpux: temporary work around of hpux 11.11 interface + scanning. + +1427. [bug] Race condition in adb with threaded build. + +1426. [cleanup] Disable RFC2535 style DNSSEC. This is incompatible + with the forthcoming DS style DNSSEC. + +1425. [port] linux/libbind: define __USE_MISC when testing *_r() + function prototypes in netdb.h. [RT #4921] + +1395. [port] OpenSSL 0.9.7 defines CRYPTO_LOCK_ENGINE but doesn't + have a working implementation. [RT #4079] + +1382. [bug] make install failed with --enable-libbind. [RT #3656] + +1381. [bug] named failed to correctly process answers that + contained DNAME records where the resulting CNAME + resulted in a negative answer. + --- 9.2.2rc1 released --- 1357. [bug] --enable-libbind would fail when not built in the @@ -28,7 +50,7 @@ 1350. [bug] dns_name_fromtext() failed to handle too many labels gracefully. -1349. [security] Mimimum OpenSSL version now 0.9.6e (was 0.9.5a). +1349. [security] Minimum OpenSSL version now 0.9.6e (was 0.9.5a). http://www.cert.org/advisories/CA-2002-23.html 1346. [bug] Win32: select timeout in socket.c was too small @@ -140,7 +162,7 @@ 1274. [bug] Memory leak in lwres_gnbarequest_parse(). -1273. [port] libbind: solaris: 64 bit binary compatability. +1273. [port] libbind: solaris: 64 bit binary compatibility. 1272. [contrib] Berkeley DB 4.0 sdb implementation from Nuno Miguel Rodrigues <nmr@co.sapo.pt>. @@ -215,7 +237,7 @@ 1095. [func] libbind: resolver option: no-tld-query. disables trying unqualified as a tld. no_tld_query is also - supported for FreeBSD compatability. + supported for FreeBSD compatibility. 1094. [func] libbind: add support gcc's format string checking. @@ -63,7 +63,7 @@ 1187. [bug] named was incorrectly returning DNSSEC records in negative responses when the DO bit was not set. - [ Requires API change (new arguement) to + [ Requires API change (new argument) to dns_rdataset_towire(), dns_rdataset_towirepartial() and dns_rdataset_towirepartial() ] @@ -231,7 +231,7 @@ the queries and / or the replies. Q: How can I make a server a slave for both an internal and an external view at the same time? When I tried, both views -on the slave were transfered from the same view on the master. +on the slave were transferred from the same view on the master. A: You will need to give the master and slave multiple IP addresses and use those to make sure you reach the correct view on the other machine. @@ -282,7 +282,7 @@ the name server using IPv6. Q: I have Freebsd 4.4 and "rndc-confgen -a" just sits there. A: /dev/random is not configured. Use rndcontrol(8) to tell the kernel -to use certian interupts as a source of random events. You can make this +to use certain interrupts as a source of random events. You can make this permanent by setting rand_irqs in /etc/rc.conf. e.g. @@ -298,10 +298,10 @@ port and/or address. Q: I get error messages like "multiple RRs of singleton type" and -"CNAME and other data" when transfering a zone. What does this mean? +"CNAME and other data" when transferring a zone. What does this mean? A: These indicate a malformed master zone. You can identify the -exact records involved by transfering the zone using dig then +exact records involved by transferring the zone using dig then running named-checkzone on it. e.g. @@ -44,13 +44,15 @@ BIND 9 Nominum, Inc. -BIND 9.2.2 (release candidate 1) +BIND 9.2.2 - BIND 9.2.1 is a maintenance release, containing fixes for - a number of bugs in 9.2.1 but no new features. + BIND 9.2.2 is a maintenance release, containing fixes for + a number of bugs in 9.2.1 but no new features. RFC 2535 + style DNSSEC is disabled as it is incompatible with the + forthcoming DS style DNSSEC. libbind: from BIND 8.3.3. [CERT CA-2002-19] - Mimimum OpenSSL version now 0.9.6e. [CERT CA-2002-23] + Minimum OpenSSL version now 0.9.6e. [CERT CA-2002-23] BIND 9.2.1 @@ -85,7 +87,7 @@ BIND 9.2.0 - The named.conf parser has been completely rewritten. It now supports "include" directives in more - places such as inside "view" statememnts, and it no + places such as inside "view" statements, and it no longer has any reserved words. - The "rndc status" command is now implemented. @@ -220,6 +222,13 @@ Building Any additional preprocessor symbols you want defined. Defaults to empty string. + Possible settings: + -DISC_RFC2535 + Enable support RFC 2535 style DNSSEC. This + is incompatable with the upcoming DS support + and SHOULD NOT be set unless you are currently + making use of it. + To build shared libraries, specify "--with-libtool" on the configure command line. @@ -270,6 +279,10 @@ Building Building with gcc is not supported, unless gcc is the vendor's usual compiler (e.g. the various BSD systems, Linux). + + * gcc-3.2.1 and gcc-3.1.1 is known to cause problems with solaris-x86 + if the optimiser is enabled. Use -O0 to disable the optimiser. + * gcc ultrasparc generates incorrect code at -02. A limited test suite can be run with "make test". Many of the tests require you to configure a set of virtual IP addresses diff --git a/bin/check/named-checkconf.html b/bin/check/named-checkconf.html index 19c330f3..c20e40f4 100644 --- a/bin/check/named-checkconf.html +++ b/bin/check/named-checkconf.html @@ -20,7 +20,7 @@ >named-checkconf</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -190,4 +190,4 @@ NAME="AEN56" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/check/named-checkzone.html b/bin/check/named-checkzone.html index 6b8847bf..e2fda945 100644 --- a/bin/check/named-checkzone.html +++ b/bin/check/named-checkzone.html @@ -231,4 +231,4 @@ NAME="AEN80" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/dig/dig.1 b/bin/dig/dig.1 index 352c0e20..2f9dfd6c 100644 --- a/bin/dig/dig.1 +++ b/bin/dig/dig.1 @@ -186,7 +186,7 @@ The search list is not used by default. Deprecated, treated as a synonym for \fI+[no]search\fR .TP \fB+[no]aaonly\fR -This option does nothing. It is provided for compatibilty with old +This option does nothing. It is provided for compatibility with old versions of \fBdig\fR where it set an unimplemented resolver flag. .TP diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook index 7b816d01..4e79cc36 100644 --- a/bin/dig/dig.docbook +++ b/bin/dig/dig.docbook @@ -1,6 +1,6 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> <!-- - - Copyright (C) 2000, 2001 Internet Software Consortium. + - Copyright (C) 2000, 2001, 2003 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 @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: dig.docbook,v 1.4.2.2 2001/11/28 23:35:02 gson Exp $ --> +<!-- $Id: dig.docbook,v 1.4.2.2.4.2 2003/02/17 07:05:02 marka Exp $ --> <refentry> @@ -290,7 +290,7 @@ Deprecated, treated as a synonym for <parameter>+[no]search</parameter> <varlistentry><term><option>+[no]aaonly</option></term> <listitem><para> -This option does nothing. It is provided for compatibilty with old +This option does nothing. It is provided for compatibility with old versions of <command>dig</command> where it set an unimplemented resolver flag. </para></listitem></varlistentry> diff --git a/bin/dig/dig.html b/bin/dig/dig.html index c635b6e6..d6db1c82 100644 --- a/bin/dig/dig.html +++ b/bin/dig/dig.html @@ -20,7 +20,7 @@ >dig</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -637,7 +637,7 @@ CLASS="OPTION" ></DT ><DD ><P ->This option does nothing. It is provided for compatibilty with old +>This option does nothing. It is provided for compatibility with old versions of <B CLASS="COMMAND" >dig</B @@ -1137,4 +1137,4 @@ NAME="AEN370" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/dig/host.1 b/bin/dig/host.1 index 030280a4..38a1ef65 100644 --- a/bin/dig/host.1 +++ b/bin/dig/host.1 @@ -62,7 +62,7 @@ output. List mode is selected by the \fB-l\fR option. This makes \fBhost\fR perform a zone transfer for zone \fIname\fR. The argument is provided for -compatibility with older implemementations. This option is equivalent +compatibility with older implementations. This option is equivalent to making a query of type AXFR. .PP The \fB-n\fR diff --git a/bin/dig/host.docbook b/bin/dig/host.docbook index 666a7649..48617b5b 100644 --- a/bin/dig/host.docbook +++ b/bin/dig/host.docbook @@ -1,6 +1,6 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> <!-- - - Copyright (C) 2000, 2001 Internet Software Consortium. + - Copyright (C) 2000, 2001, 2003 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 @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: host.docbook,v 1.2 2001/06/08 17:18:13 gson Exp $ --> +<!-- $Id: host.docbook,v 1.2.10.2 2003/02/17 07:05:03 marka Exp $ --> <refentry> @@ -104,7 +104,7 @@ output. List mode is selected by the <option>-l</option> option. This makes <command>host</command> perform a zone transfer for zone <parameter>name</parameter>. The argument is provided for -compatibility with older implemementations. This option is equivalent +compatibility with older implementations. This option is equivalent to making a query of type AXFR. </para> diff --git a/bin/dig/host.html b/bin/dig/host.html index 3896b3d9..9b3b730a 100644 --- a/bin/dig/host.html +++ b/bin/dig/host.html @@ -20,7 +20,7 @@ >host</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -225,7 +225,7 @@ CLASS="PARAMETER" >name</I ></TT >. The argument is provided for -compatibility with older implemementations. This option is equivalent +compatibility with older implementations. This option is equivalent to making a query of type AXFR.</P ><P >The <TT @@ -437,4 +437,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/dnssec/dnssec-keygen.html b/bin/dnssec/dnssec-keygen.html index d7ba6e41..a4802275 100644 --- a/bin/dnssec/dnssec-keygen.html +++ b/bin/dnssec/dnssec-keygen.html @@ -20,7 +20,7 @@ >dnssec-keygen</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -569,4 +569,4 @@ NAME="AEN177" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/dnssec/dnssec-makekeyset.8 b/bin/dnssec/dnssec-makekeyset.8 index 85639c10..4463d085 100644 --- a/bin/dnssec/dnssec-makekeyset.8 +++ b/bin/dnssec/dnssec-makekeyset.8 @@ -48,7 +48,7 @@ Specify the date and time when the generated SIG records expire. As with \fBstart-time\fR, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from -the start time. A time realtive to the current time is +the start time. A time relative to the current time is indicated with now+N. If no \fBend-time\fR is specified, 30 days from the start time is used as a default. .TP diff --git a/bin/dnssec/dnssec-makekeyset.docbook b/bin/dnssec/dnssec-makekeyset.docbook index a38841cb..ae5ec954 100644 --- a/bin/dnssec/dnssec-makekeyset.docbook +++ b/bin/dnssec/dnssec-makekeyset.docbook @@ -1,6 +1,6 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> <!-- - - Copyright (C) 2001 Internet Software Consortium. + - Copyright (C) 2001, 2003 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 @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: dnssec-makekeyset.docbook,v 1.2.2.1 2001/09/14 20:29:32 gson Exp $ --> +<!-- $Id: dnssec-makekeyset.docbook,v 1.2.2.1.6.2 2003/02/17 07:05:03 marka Exp $ --> <refentry> <refentryinfo> @@ -98,7 +98,7 @@ expire. As with <option>start-time</option>, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from - the start time. A time realtive to the current time is + the start time. A time relative to the current time is indicated with now+N. If no <option>end-time</option> is specified, 30 days from the start time is used as a default. </para> diff --git a/bin/dnssec/dnssec-makekeyset.html b/bin/dnssec/dnssec-makekeyset.html index aa7566da..e081ccf9 100644 --- a/bin/dnssec/dnssec-makekeyset.html +++ b/bin/dnssec/dnssec-makekeyset.html @@ -20,7 +20,7 @@ >dnssec-makekeyset</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -195,7 +195,7 @@ CLASS="OPTION" >, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from - the start time. A time realtive to the current time is + the start time. A time relative to the current time is indicated with now+N. If no <TT CLASS="OPTION" >end-time</TT @@ -401,4 +401,4 @@ NAME="AEN123" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/dnssec/dnssec-signkey.8 b/bin/dnssec/dnssec-signkey.8 index 80051aff..ceda9dbc 100644 --- a/bin/dnssec/dnssec-signkey.8 +++ b/bin/dnssec/dnssec-signkey.8 @@ -51,7 +51,7 @@ Specify the date and time when the generated SIG records expire. As with \fBstart-time\fR, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from -the start time. A time realtive to the current time is +the start time. A time relative to the current time is indicated with now+N. If no \fBend-time\fR is specified, 30 days from the start time is used as a default. .TP diff --git a/bin/dnssec/dnssec-signkey.docbook b/bin/dnssec/dnssec-signkey.docbook index cea3b62e..490be29f 100644 --- a/bin/dnssec/dnssec-signkey.docbook +++ b/bin/dnssec/dnssec-signkey.docbook @@ -1,6 +1,6 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> <!-- - - Copyright (C) 2001 Internet Software Consortium. + - Copyright (C) 2001, 2003 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 @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: dnssec-signkey.docbook,v 1.2 2001/04/10 21:50:34 bwelling Exp $ --> +<!-- $Id: dnssec-signkey.docbook,v 1.2.120.2 2003/02/17 07:05:03 marka Exp $ --> <refentry> <refentryinfo> @@ -108,7 +108,7 @@ expire. As with <option>start-time</option>, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from - the start time. A time realtive to the current time is + the start time. A time relative to the current time is indicated with now+N. If no <option>end-time</option> is specified, 30 days from the start time is used as a default. </para> diff --git a/bin/dnssec/dnssec-signkey.html b/bin/dnssec/dnssec-signkey.html index d98fd225..7f0306c0 100644 --- a/bin/dnssec/dnssec-signkey.html +++ b/bin/dnssec/dnssec-signkey.html @@ -20,7 +20,7 @@ >dnssec-signkey</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -207,7 +207,7 @@ CLASS="OPTION" >, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from - the start time. A time realtive to the current time is + the start time. A time relative to the current time is indicated with now+N. If no <TT CLASS="OPTION" >end-time</TT @@ -401,4 +401,4 @@ NAME="AEN128" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/dnssec/dnssec-signzone.8 b/bin/dnssec/dnssec-signzone.8 index b3960998..39710938 100644 --- a/bin/dnssec/dnssec-signzone.8 +++ b/bin/dnssec/dnssec-signzone.8 @@ -57,7 +57,7 @@ Specify the date and time when the generated SIG records expire. As with \fBstart-time\fR, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from -the start time. A time realtive to the current time is +the start time. A time relative to the current time is indicated with now+N. If no \fBend-time\fR is specified, 30 days from the start time is used as a default. .TP diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c index 4f6b956c..4ff4d6c6 100644 --- a/bin/dnssec/dnssec-signzone.c +++ b/bin/dnssec/dnssec-signzone.c @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 1999-2001 Internet Software Consortium. + * Portions Copyright (C) 1999-2001, 2003 Internet Software Consortium. * Portions Copyright (C) 1995-2000 by Network Associates, Inc. * * Permission to use, copy, modify, and distribute this software for any @@ -17,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dnssec-signzone.c,v 1.139.2.1 2001/10/05 00:21:48 bwelling Exp $ */ +/* $Id: dnssec-signzone.c,v 1.139.2.1.6.3 2003/02/17 07:05:03 marka Exp $ */ #include <config.h> @@ -1487,6 +1487,16 @@ usage(void) { fprintf(stderr, "Signing Keys: "); fprintf(stderr, "(default: all zone keys that have private keys)\n"); fprintf(stderr, "\tkeyfile (Kname+alg+tag)\n"); +#ifndef ISC_RFC2535 + fprintf(stderr, +"WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING\n" +"WARNING WARNING\n" +"WARNING This version of dnssec-signzone produces zones that are WARNING\n" +"WARNING incompatible with the forthcoming DS based DNSSEC WARNING\n" +"WARNING standard. WARNING\n" +"WARNING WARNING\n" +"WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING\n"); +#endif exit(0); } @@ -1597,6 +1607,17 @@ main(int argc, char *argv[]) { } } +#ifndef ISC_RFC2535 + fprintf(stderr, +"WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING\n" +"WARNING WARNING\n" +"WARNING This version of dnssec-signzone produces zones that are WARNING\n" +"WARNING incompatible with the forth coming DS based DNSSEC WARNING\n" +"WARNING standard. WARNING\n" +"WARNING WARNING\n" +"WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING\n"); +#endif + setup_entropy(mctx, randomfile, &ectx); eflags = ISC_ENTROPY_BLOCKING; if (!pseudorandom) diff --git a/bin/dnssec/dnssec-signzone.docbook b/bin/dnssec/dnssec-signzone.docbook index 14e0fa2e..912e79b5 100644 --- a/bin/dnssec/dnssec-signzone.docbook +++ b/bin/dnssec/dnssec-signzone.docbook @@ -1,6 +1,6 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> <!-- - - Copyright (C) 2001 Internet Software Consortium. + - Copyright (C) 2001, 2003 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 @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: dnssec-signzone.docbook,v 1.2 2001/04/10 21:50:37 bwelling Exp $ --> +<!-- $Id: dnssec-signzone.docbook,v 1.2.52.2 2003/02/17 07:05:03 marka Exp $ --> <refentry> <refentryinfo> @@ -126,7 +126,7 @@ expire. As with <option>start-time</option>, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from - the start time. A time realtive to the current time is + the start time. A time relative to the current time is indicated with now+N. If no <option>end-time</option> is specified, 30 days from the start time is used as a default. </para> diff --git a/bin/dnssec/dnssec-signzone.html b/bin/dnssec/dnssec-signzone.html index ed3ba8e7..6925d324 100644 --- a/bin/dnssec/dnssec-signzone.html +++ b/bin/dnssec/dnssec-signzone.html @@ -20,7 +20,7 @@ >dnssec-signzone</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -268,7 +268,7 @@ CLASS="OPTION" >, an absolute time is indicated in YYYYMMDDHHMMSS notation. A time relative to the start time is indicated with +N, which is N seconds from - the start time. A time realtive to the current time is + the start time. A time relative to the current time is indicated with now+N. If no <TT CLASS="OPTION" >end-time</TT @@ -550,4 +550,4 @@ NAME="AEN179" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/named/client.c b/bin/named/client.c index 78c07bb6..fc64ad6f 100644 --- a/bin/named/client.c +++ b/bin/named/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 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: client.c,v 1.176.2.11 2002/04/23 01:53:53 marka Exp $ */ +/* $Id: client.c,v 1.176.2.11.4.2 2003/02/17 07:05:04 marka Exp $ */ #include <config.h> @@ -1014,7 +1014,11 @@ client_addopt(ns_client_t *client) { /* * Set EXTENDED-RCODE, VERSION, and Z to 0. */ +#ifdef ISC_RFC2535 rdatalist->ttl = (client->extflags & DNS_MESSAGEEXTFLAG_REPLYPRESERVE); +#else + rdatalist->ttl = 0; +#endif /* * No ENDS options in the default case. diff --git a/bin/named/lwresd.html b/bin/named/lwresd.html index 2f569391..32bfe1c6 100644 --- a/bin/named/lwresd.html +++ b/bin/named/lwresd.html @@ -20,7 +20,7 @@ >lwresd</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -535,4 +535,4 @@ NAME="AEN162" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/named/named.html b/bin/named/named.html index 4a1a1f50..28a14d3b 100644 --- a/bin/named/named.html +++ b/bin/named/named.html @@ -20,7 +20,7 @@ >named</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -627,4 +627,4 @@ NAME="AEN182" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/named/query.c b/bin/named/query.c index 59bd89f1..4068a53d 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 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: query.c,v 1.198.2.8 2002/08/02 04:17:21 marka Exp $ */ +/* $Id: query.c,v 1.198.2.8.4.2 2003/02/17 07:05:04 marka Exp $ */ #include <config.h> @@ -3300,9 +3300,11 @@ ns_query_start(ns_client_t *client) { if ((message->flags & DNS_MESSAGEFLAG_RD) != 0) client->query.attributes |= NS_QUERYATTR_WANTRECURSION; +#ifdef ISC_RFC2535 if ((client->extflags & DNS_MESSAGEEXTFLAG_DO) != 0 || (message->flags & DNS_MESSAGEFLAG_AD) != 0) client->query.attributes |= NS_QUERYATTR_WANTDNSSEC; +#endif if (client->view->minimalresponses) client->query.attributes |= (NS_QUERYATTR_NOAUTHORITY | diff --git a/bin/named/server.c b/bin/named/server.c index 69579c42..3cf2ce4b 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 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: server.c,v 1.339.2.8 2002/07/10 04:27:23 marka Exp $ */ +/* $Id: server.c,v 1.339.2.8.4.3 2003/02/18 03:27:58 marka Exp $ */ #include <config.h> @@ -163,6 +163,7 @@ configure_view_acl(cfg_obj_t *vconfig, cfg_obj_t *config, return (result); } +#ifdef ISC_RFC2335 static isc_result_t configure_view_dnsseckey(cfg_obj_t *vconfig, cfg_obj_t *key, dns_keytable_t *keytable, isc_mem_t *mctx) @@ -258,6 +259,7 @@ configure_view_dnsseckey(cfg_obj_t *vconfig, cfg_obj_t *key, return (result); } +#endif /* * Configure DNSSEC keys for a view. Currently used only for @@ -271,15 +273,21 @@ configure_view_dnsseckeys(cfg_obj_t *vconfig, cfg_obj_t *config, isc_mem_t *mctx, dns_keytable_t **target) { isc_result_t result; +#ifdef ISC_RFC2535 cfg_obj_t *keys = NULL; cfg_obj_t *voptions = NULL; cfg_listelt_t *element, *element2; cfg_obj_t *keylist; cfg_obj_t *key; +#endif dns_keytable_t *keytable = NULL; CHECK(dns_keytable_create(mctx, &keytable)); +#ifndef ISC_RFC2535 + UNUSED(vconfig); + UNUSED(config); +#else if (vconfig != NULL) voptions = cfg_tuple_get(vconfig, "options"); @@ -303,7 +311,7 @@ configure_view_dnsseckeys(cfg_obj_t *vconfig, cfg_obj_t *config, keytable, mctx)); } } - +#endif dns_keytable_detach(target); *target = keytable; /* Transfer ownership. */ keytable = NULL; diff --git a/bin/nsupdate/nsupdate.html b/bin/nsupdate/nsupdate.html index b8e63dca..7fabc927 100644 --- a/bin/nsupdate/nsupdate.html +++ b/bin/nsupdate/nsupdate.html @@ -20,7 +20,7 @@ >nsupdate</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -956,4 +956,4 @@ releases.</P ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/rndc/rndc-confgen.8 b/bin/rndc/rndc-confgen.8 index 226a450a..217d54f2 100644 --- a/bin/rndc/rndc-confgen.8 +++ b/bin/rndc/rndc-confgen.8 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2001, 2002 Internet Software Consortium. +.\" Copyright (C) 2001-2003 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 @@ -13,7 +13,7 @@ .\" NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION .\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.\" $Id: rndc-confgen.8,v 1.3.2.2 2002/08/05 06:57:04 marka Exp $ +.\" $Id: rndc-confgen.8,v 1.3.2.2.4.2 2003/02/17 07:05:06 marka Exp $ .TH "RNDC-CONFGEN" "8" "Aug 27, 2001" "BIND9" "" .SH NAME @@ -79,7 +79,7 @@ The default is 953. .TP \fB-r \fIrandomfile\fB\fR Specifies a source of random data for generating the -authoriazation. If the operating +authorization. If the operating system does not provide a \fI/dev/random\fR or equivalent device, the default source of randomness is keyboard input. \fIrandomdev\fR specifies diff --git a/bin/rndc/rndc-confgen.docbook b/bin/rndc/rndc-confgen.docbook index 0f250bbe..26029c95 100644 --- a/bin/rndc/rndc-confgen.docbook +++ b/bin/rndc/rndc-confgen.docbook @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: rndc-confgen.docbook,v 1.3 2001/08/29 03:27:57 marka Exp $ --> +<!-- $Id: rndc-confgen.docbook,v 1.3.8.1 2003/02/17 01:29:29 marka Exp $ --> <refentry> <refentryinfo> @@ -155,7 +155,7 @@ <listitem> <para> Specifies a source of random data for generating the - authoriazation. If the operating + authorization. If the operating system does not provide a <filename>/dev/random</filename> or equivalent device, the default source of randomness is keyboard input. <filename>randomdev</filename> specifies diff --git a/bin/rndc/rndc-confgen.html b/bin/rndc/rndc-confgen.html index f5c756f7..14cc86da 100644 --- a/bin/rndc/rndc-confgen.html +++ b/bin/rndc/rndc-confgen.html @@ -1,5 +1,5 @@ <!-- - - Copyright (C) 2001, 2002 Internet Software Consortium. + - Copyright (C) 2001-2003 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: rndc-confgen.html,v 1.3.2.2 2002/08/05 06:57:04 marka Exp $ --> +<!-- $Id: rndc-confgen.html,v 1.3.2.2.4.2 2003/02/17 07:05:06 marka Exp $ --> <HTML ><HEAD @@ -23,7 +23,7 @@ >rndc-confgen</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -353,7 +353,7 @@ CLASS="REPLACEABLE" ><DD ><P > Specifies a source of random data for generating the - authoriazation. If the operating + authorization. If the operating system does not provide a <TT CLASS="FILENAME" >/dev/random</TT @@ -545,4 +545,4 @@ NAME="AEN167" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/rndc/rndc.conf.html b/bin/rndc/rndc.conf.html index 93dad779..624d0ab2 100644 --- a/bin/rndc/rndc.conf.html +++ b/bin/rndc/rndc.conf.html @@ -20,7 +20,7 @@ >rndc.conf</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -375,4 +375,4 @@ NAME="AEN91" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/rndc/rndc.html b/bin/rndc/rndc.html index 81a5310a..dd5811bc 100644 --- a/bin/rndc/rndc.html +++ b/bin/rndc/rndc.html @@ -20,7 +20,7 @@ >rndc</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -418,4 +418,4 @@ NAME="AEN118" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 5b45b7df..1ca8f93a 100755 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2000, 2001 Internet Software Consortium. +# Copyright (C) 2000, 2001, 2003 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: conf.sh.in,v 1.23 2001/08/01 19:00:58 gson Exp $ +# $Id: conf.sh.in,v 1.23.10.2 2003/02/17 07:05:06 marka Exp $ # # Common configuration data for system tests, to be sourced into @@ -42,7 +42,10 @@ KEYSETTOOL=$TOP/bin/dnssec/dnssec-makekeyset # The "stress" test is not run by default since it creates enough # load on the machine to make it unusable to other users. -SUBDIRS="cacheclean dnssec forward glue ixfr limits lwresd \ +# +# dnssec and lwresd are missing from SUBDIRS as RFC 2535 support is disabled +# +SUBDIRS="cacheclean forward glue ixfr limits \ masterfile notify nsupdate resolver sortlist stub tkey \ unknown upforwd v6synth views xfer xferquota" @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.294.2.16 . +# From configure.in Revision: 1.294.2.16.4.2 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -1827,7 +1827,7 @@ done # # Special processing of paths depending on whether --prefix, # --sysconfdir or --localstatedir arguments were given. What's -# desired is some compatability with the way previous versions +# desired is some compatibility with the way previous versions # of BIND built; they defaulted to /usr/local for most parts of # the installation, but named.boot/named.conf was in /etc # and named.pid was in /var/run. @@ -3466,17 +3466,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define sysctlbyname to an innocuous variant, in case <limits.h> declares sysctlbyname. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define sysctlbyname innocuous_sysctlbyname + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char sysctlbyname (); below. */ -#include <assert.h> + which can conflict with char sysctlbyname (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef sysctlbyname + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char sysctlbyname (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_sysctlbyname) || defined (__stub___sysctlbyname) +choke me +#else +char (*f) () = sysctlbyname; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -3487,15 +3513,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_sysctlbyname) || defined (__stub___sysctlbyname) -choke me -#else -f = sysctlbyname; -#endif - +return f != sysctlbyname; ; return 0; } @@ -4299,17 +4317,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define OpenSSLDie to an innocuous variant, in case <limits.h> declares OpenSSLDie. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define OpenSSLDie innocuous_OpenSSLDie + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char OpenSSLDie (); below. */ -#include <assert.h> + which can conflict with char OpenSSLDie (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef OpenSSLDie + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char OpenSSLDie (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_OpenSSLDie) || defined (__stub___OpenSSLDie) +choke me +#else +char (*f) () = OpenSSLDie; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -4320,15 +4364,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_OpenSSLDie) || defined (__stub___OpenSSLDie) -choke me -#else -f = OpenSSLDie; -#endif - +return f != OpenSSLDie; ; return 0; } @@ -5266,17 +5302,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define pthread_attr_getstacksize to an innocuous variant, in case <limits.h> declares pthread_attr_getstacksize. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define pthread_attr_getstacksize innocuous_pthread_attr_getstacksize + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_attr_getstacksize (); below. */ -#include <assert.h> + which can conflict with char pthread_attr_getstacksize (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef pthread_attr_getstacksize + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_attr_getstacksize (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_pthread_attr_getstacksize) || defined (__stub___pthread_attr_getstacksize) +choke me +#else +char (*f) () = pthread_attr_getstacksize; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5287,15 +5349,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_pthread_attr_getstacksize) || defined (__stub___pthread_attr_getstacksize) -choke me -#else -f = pthread_attr_getstacksize; -#endif - +return f != pthread_attr_getstacksize; ; return 0; } @@ -5439,17 +5493,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define pthread_setconcurrency to an innocuous variant, in case <limits.h> declares pthread_setconcurrency. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define pthread_setconcurrency innocuous_pthread_setconcurrency + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_setconcurrency (); below. */ -#include <assert.h> + which can conflict with char pthread_setconcurrency (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef pthread_setconcurrency + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_setconcurrency (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_pthread_setconcurrency) || defined (__stub___pthread_setconcurrency) +choke me +#else +char (*f) () = pthread_setconcurrency; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5460,15 +5540,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_pthread_setconcurrency) || defined (__stub___pthread_setconcurrency) -choke me -#else -f = pthread_setconcurrency; -#endif - +return f != pthread_setconcurrency; ; return 0; } @@ -5525,17 +5597,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define sysconf to an innocuous variant, in case <limits.h> declares sysconf. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define sysconf innocuous_sysconf + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char sysconf (); below. */ -#include <assert.h> + which can conflict with char sysconf (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef sysconf + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char sysconf (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_sysconf) || defined (__stub___sysconf) +choke me +#else +char (*f) () = sysconf; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5546,15 +5644,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_sysconf) || defined (__stub___sysconf) -choke me -#else -f = sysconf; -#endif - +return f != sysconf; ; return 0; } @@ -5654,17 +5744,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define flockfile to an innocuous variant, in case <limits.h> declares flockfile. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define flockfile innocuous_flockfile + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char flockfile (); below. */ -#include <assert.h> + which can conflict with char flockfile (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef flockfile + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char flockfile (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_flockfile) || defined (__stub___flockfile) +choke me +#else +char (*f) () = flockfile; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5675,15 +5791,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_flockfile) || defined (__stub___flockfile) -choke me -#else -f = flockfile; -#endif - +return f != flockfile; ; return 0; } @@ -5725,17 +5833,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getc_unlocked to an innocuous variant, in case <limits.h> declares getc_unlocked. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getc_unlocked innocuous_getc_unlocked + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getc_unlocked (); below. */ -#include <assert.h> + which can conflict with char getc_unlocked (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getc_unlocked + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getc_unlocked (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getc_unlocked) || defined (__stub___getc_unlocked) +choke me +#else +char (*f) () = getc_unlocked; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5746,15 +5880,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getc_unlocked) || defined (__stub___getc_unlocked) -choke me -#else -f = getc_unlocked; -#endif - +return f != getc_unlocked; ; return 0; } @@ -5878,17 +6004,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define catgets to an innocuous variant, in case <limits.h> declares catgets. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define catgets innocuous_catgets + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char catgets (); below. */ -#include <assert.h> + which can conflict with char catgets (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef catgets + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char catgets (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_catgets) || defined (__stub___catgets) +choke me +#else +char (*f) () = catgets; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5899,15 +6051,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_catgets) || defined (__stub___catgets) -choke me -#else -f = catgets; -#endif - +return f != catgets; ; return 0; } @@ -7227,7 +7371,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 7230 "configure"' > conftest.$ac_ext + echo '#line 7374 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7770,7 +7914,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:7773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:7917: \"$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 @@ -9133,17 +9277,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include <assert.h> + which can conflict with char dlopen (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -9154,15 +9324,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -f = dlopen; -#endif - +return f != dlopen; ; return 0; } @@ -9200,17 +9362,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include <assert.h> + which can conflict with char shl_load (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -9221,15 +9409,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -f = shl_load; -#endif - +return f != shl_load; ; return 0; } @@ -9419,7 +9599,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9422 "configure" +#line 9602 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9517,7 +9697,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9520 "configure" +#line 9700 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11517,17 +11697,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getipnodebyname to an innocuous variant, in case <limits.h> declares getipnodebyname. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getipnodebyname innocuous_getipnodebyname + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getipnodebyname (); below. */ -#include <assert.h> + which can conflict with char getipnodebyname (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getipnodebyname + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getipnodebyname (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getipnodebyname) || defined (__stub___getipnodebyname) +choke me +#else +char (*f) () = getipnodebyname; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11538,15 +11744,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getipnodebyname) || defined (__stub___getipnodebyname) -choke me -#else -f = getipnodebyname; -#endif - +return f != getipnodebyname; ; return 0; } @@ -11587,17 +11785,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getnameinfo to an innocuous variant, in case <limits.h> declares getnameinfo. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getnameinfo innocuous_getnameinfo + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getnameinfo (); below. */ -#include <assert.h> + which can conflict with char getnameinfo (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getnameinfo + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getnameinfo (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo) +choke me +#else +char (*f) () = getnameinfo; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11608,15 +11832,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo) -choke me -#else -f = getnameinfo; -#endif - +return f != getnameinfo; ; return 0; } @@ -11657,17 +11873,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getaddrinfo innocuous_getaddrinfo + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getaddrinfo (); below. */ -#include <assert.h> + which can conflict with char getaddrinfo (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getaddrinfo + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getaddrinfo (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) +choke me +#else +char (*f) () = getaddrinfo; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11678,15 +11920,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) -choke me -#else -f = getaddrinfo; -#endif - +return f != getaddrinfo; ; return 0; } @@ -11731,17 +11965,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define gai_strerror to an innocuous variant, in case <limits.h> declares gai_strerror. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define gai_strerror innocuous_gai_strerror + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gai_strerror (); below. */ -#include <assert.h> + which can conflict with char gai_strerror (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef gai_strerror + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gai_strerror (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror) +choke me +#else +char (*f) () = gai_strerror; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11752,15 +12012,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror) -choke me -#else -f = gai_strerror; -#endif - +return f != gai_strerror; ; return 0; } @@ -11890,17 +12142,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define vsnprintf to an innocuous variant, in case <limits.h> declares vsnprintf. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define vsnprintf innocuous_vsnprintf + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char vsnprintf (); below. */ -#include <assert.h> + which can conflict with char vsnprintf (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef vsnprintf + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char vsnprintf (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_vsnprintf) || defined (__stub___vsnprintf) +choke me +#else +char (*f) () = vsnprintf; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11911,15 +12189,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_vsnprintf) || defined (__stub___vsnprintf) -choke me -#else -f = vsnprintf; -#endif - +return f != vsnprintf; ; return 0; } @@ -11964,17 +12234,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define strerror to an innocuous variant, in case <limits.h> declares strerror. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define strerror innocuous_strerror + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strerror (); below. */ -#include <assert.h> + which can conflict with char strerror (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef strerror + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strerror (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_strerror) || defined (__stub___strerror) +choke me +#else +char (*f) () = strerror; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11985,15 +12281,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_strerror) || defined (__stub___strerror) -choke me -#else -f = strerror; -#endif - +return f != strerror; ; return 0; } @@ -12088,17 +12376,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define chroot to an innocuous variant, in case <limits.h> declares chroot. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define chroot innocuous_chroot + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char chroot (); below. */ -#include <assert.h> + which can conflict with char chroot (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef chroot + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char chroot (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_chroot) || defined (__stub___chroot) +choke me +#else +char (*f) () = chroot; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -12109,15 +12423,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_chroot) || defined (__stub___chroot) -choke me -#else -f = chroot; -#endif - +return f != chroot; ; return 0; } diff --git a/configure.in b/configure.in index f6020db4..ecf33448 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2002 Internet Software Consortium. +# Copyright (C) 1998-2003 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 @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.294.2.16 $) +AC_REVISION($Revision: 1.294.2.16.4.2 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) @@ -81,7 +81,7 @@ AC_SUBST(PERL) # # Special processing of paths depending on whether --prefix, # --sysconfdir or --localstatedir arguments were given. What's -# desired is some compatability with the way previous versions +# desired is some compatibility with the way previous versions # of BIND built; they defaulted to /usr/local for most parts of # the installation, but named.boot/named.conf was in /etc # and named.pid was in /var/run. diff --git a/contrib/idn/mdnkit/patch/bind9/patch.configure b/contrib/idn/mdnkit/patch/bind9/patch.configure index d0c9cc41..24ff5ea5 100644 --- a/contrib/idn/mdnkit/patch/bind9/patch.configure +++ b/contrib/idn/mdnkit/patch/bind9/patch.configure @@ -1,10 +1,10 @@ Index: configure =================================================================== RCS file: /proj/cvs/isc/bind9/configure,v -retrieving revision 1.284.2.12 -diff -u -u -2 -r1.284.2.12 configure ---- configure 8 Aug 2002 06:45:45 -0000 1.284.2.12 -+++ configure 8 Aug 2002 06:56:09 -0000 +retrieving revision 1.284.2.13.4.2 +diff -u -u -2 -r1.284.2.13.4.2 configure +--- configure 18 Feb 2003 04:16:23 -0000 1.284.2.13.4.2 ++++ configure 18 Feb 2003 04:24:24 -0000 @@ -1008,4 +1008,8 @@ --with-pic try to use only PIC/non-PIC objects default=use both --with-kame=PATH use Kame IPv6 default path /usr/local/v6 @@ -14,35 +14,35 @@ diff -u -u -2 -r1.284.2.12 configure + --with-mdnlib=ARG specify libmdn Some influential environment variables: -@@ -7228,5 +7232,5 @@ +@@ -7372,5 +7376,5 @@ *-*-irix6*) # Find out which ABI we are using. -- echo '#line 7230 "configure"' > conftest.$ac_ext -+ echo '#line 7234 "configure"' > conftest.$ac_ext +- echo '#line 7374 "configure"' > conftest.$ac_ext ++ echo '#line 7378 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 -@@ -7771,5 +7775,5 @@ +@@ -7915,5 +7919,5 @@ CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no --if { (eval echo configure:7773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then -+if { (eval echo configure:7777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +-if { (eval echo configure:7917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then ++if { (eval echo configure:7921: \"$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 -@@ -9420,5 +9424,5 @@ +@@ -9600,5 +9604,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF --#line 9422 "configure" -+#line 9426 "configure" +-#line 9602 "configure" ++#line 9606 "configure" #include "confdefs.h" -@@ -9518,5 +9522,5 @@ +@@ -9698,5 +9702,5 @@ lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF --#line 9520 "configure" -+#line 9524 "configure" +-#line 9700 "configure" ++#line 9704 "configure" #include "confdefs.h" -@@ -12957,4 +12961,289 @@ +@@ -13263,4 +13267,307 @@ fi + @@ -267,17 +267,43 @@ diff -u -u -2 -r1.284.2.12 configure + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" ++/* From autoconf 2.57 */ ++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. ++ For example, HP-UX 11i <limits.h> declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ +/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. */ -+#include <assert.h> ++ which can conflict with char $ac_func (); below. ++ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since ++ <limits.h> exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include <limits.h> ++#else ++# include <assert.h> ++#endif ++ ++#undef $ac_func ++ +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" ++{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); -+char (*f) (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined (__stub_$ac_func) || defined (__stub___$ac_func) ++choke me ++#else ++char (*f) () = $ac_func; ++#endif ++#ifdef __cplusplus ++} ++#endif + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus @@ -288,15 +314,7 @@ diff -u -u -2 -r1.284.2.12 configure +int +main () +{ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+f = $ac_func; -+#endif -+ ++return f != $ac_func; + ; + return 0; +} diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index dd7dca12..04fda852 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -2,7 +2,7 @@ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN" "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"> -<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.22 2002/07/02 14:01:45 marka Exp $ --> +<!-- File: $Id: Bv9ARM-book.xml,v 1.155.2.22.4.1 2003/02/17 01:29:29 marka Exp $ --> <book> <title>BIND 9 Administrator Reference Manual</title> @@ -765,7 +765,7 @@ of a server.</para> <varlistentry><term><userinput>querylog</userinput></term> <listitem><para>Toggle query logging. Query logging can also be enabled - by explictly directing the <command>queries</command> + by explicitly directing the <command>queries</command> <command>category</command> to a <command>channel</command> in the <command>logging</command> section of <filename>named.conf</filename>.</para></listitem></varlistentry> @@ -1691,7 +1691,7 @@ ns1 14400 IN A 192.168.42.1 <title>Address to Name Lookups Using Nibble Format</title> <para>While the use of nibble format to look up names is - deprecated, it is supported for backwards compatiblity with + deprecated, it is supported for backwards compatibility with existing IPv6 applications.</para> <para>When looking up an address in nibble format, the address @@ -5231,7 +5231,7 @@ The default modifier is <command>${0,0,d}</command>. If the <command>lhs</command> is not absolute, the current <command>$ORIGIN</command> is appended to the name.</para> -<para>For compatability with earlier versions <command>$$</command> is still +<para>For compatibility with earlier versions <command>$$</command> is still recognised a indicating a literal $ in the output.</para></entry> </row> <row rowsep = "0"> diff --git a/doc/arm/Bv9ARM.ch03.html b/doc/arm/Bv9ARM.ch03.html index ebadd041..2b0b1b3e 100644 --- a/doc/arm/Bv9ARM.ch03.html +++ b/doc/arm/Bv9ARM.ch03.html @@ -988,7 +988,7 @@ CLASS="userinput" ><DD ><P >Toggle query logging. Query logging can also be enabled - by explictly directing the <B + by explicitly directing the <B CLASS="command" >queries</B > diff --git a/doc/arm/Bv9ARM.ch04.html b/doc/arm/Bv9ARM.ch04.html index f4619298..236d6bb5 100644 --- a/doc/arm/Bv9ARM.ch04.html +++ b/doc/arm/Bv9ARM.ch04.html @@ -1614,7 +1614,7 @@ NAME="AEN1029" ></H2 ><P >While the use of nibble format to look up names is - deprecated, it is supported for backwards compatiblity with + deprecated, it is supported for backwards compatibility with existing IPv6 applications.</P ><P >When looking up an address in nibble format, the address diff --git a/doc/arm/Bv9ARM.ch06.html b/doc/arm/Bv9ARM.ch06.html index 1742e1dd..3e3bfa62 100644 --- a/doc/arm/Bv9ARM.ch06.html +++ b/doc/arm/Bv9ARM.ch06.html @@ -11332,7 +11332,7 @@ CLASS="command" the name.</P > <P ->For compatability with earlier versions <B +>For compatibility with earlier versions <B CLASS="command" >$$</B > is still diff --git a/doc/misc/dnssec b/doc/misc/dnssec index 71738624..72a9c5a5 100644 --- a/doc/misc/dnssec +++ b/doc/misc/dnssec @@ -1,4 +1,4 @@ -Copyright (C) 2000-2002 Internet Software Consortium. +Copyright (C) 2000-2003 Internet Software Consortium. See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. DNSSEC Release Notes @@ -9,10 +9,11 @@ this release of BIND9. OpenSSL Library Required -To support DNSSEC, BIND 9 must be linked with version 0.9.5a or newer of -the OpenSSL library. As of BIND 9.2, the library is no longer -included in the distribution - it must be provided by the operating -system or installed separately. +To support DNSSEC, BIND 9 must be linked with version 0.9.6e or 0.9.7beta3 +or newer of the OpenSSL library (patched versions of 0.9.5a - 0.9.6d, +0.9.7beta1 and 0.9.7beta2 will also be accepted: CERT CA-2002-23). +As of BIND 9.2, the library is no longer included in the distribution - it +must be provided by the operating system or installed separately. To build BIND 9 with OpenSSL, use "configure --with-openssl". If the OpenSSL library is installed in a nonstandard location, you can @@ -88,4 +89,4 @@ future as we consider them inferior to the use of TSIG or SIG(0) to ensure the integrity of zone transfers. -$Id: dnssec,v 1.14.2.3 2002/02/08 03:57:24 marka Exp $ +$Id: dnssec,v 1.14.2.3.4.2 2003/02/17 07:05:07 marka Exp $ diff --git a/lib/bind/configure b/lib/bind/configure index 268eaec1..3718b482 100755 --- a/lib/bind/configure +++ b/lib/bind/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.83.2.2 . +# From configure.in Revision: 1.83.2.2.4.1 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53. # @@ -4635,17 +4635,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define pthread_attr_getstacksize to an innocuous variant, in case <limits.h> declares pthread_attr_getstacksize. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define pthread_attr_getstacksize innocuous_pthread_attr_getstacksize + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_attr_getstacksize (); below. */ -#include <assert.h> + which can conflict with char pthread_attr_getstacksize (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef pthread_attr_getstacksize + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_attr_getstacksize (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_pthread_attr_getstacksize) || defined (__stub___pthread_attr_getstacksize) +choke me +#else +char (*f) () = pthread_attr_getstacksize; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -4656,15 +4682,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_pthread_attr_getstacksize) || defined (__stub___pthread_attr_getstacksize) -choke me -#else -f = pthread_attr_getstacksize; -#endif - +return f != pthread_attr_getstacksize; ; return 0; } @@ -4808,17 +4826,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define pthread_setconcurrency to an innocuous variant, in case <limits.h> declares pthread_setconcurrency. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define pthread_setconcurrency innocuous_pthread_setconcurrency + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pthread_setconcurrency (); below. */ -#include <assert.h> + which can conflict with char pthread_setconcurrency (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef pthread_setconcurrency + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_setconcurrency (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_pthread_setconcurrency) || defined (__stub___pthread_setconcurrency) +choke me +#else +char (*f) () = pthread_setconcurrency; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -4829,15 +4873,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_pthread_setconcurrency) || defined (__stub___pthread_setconcurrency) -choke me -#else -f = pthread_setconcurrency; -#endif - +return f != pthread_setconcurrency; ; return 0; } @@ -4916,17 +4952,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define sysconf to an innocuous variant, in case <limits.h> declares sysconf. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define sysconf innocuous_sysconf + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char sysconf (); below. */ -#include <assert.h> + which can conflict with char sysconf (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef sysconf + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char sysconf (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_sysconf) || defined (__stub___sysconf) +choke me +#else +char (*f) () = sysconf; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -4937,15 +4999,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_sysconf) || defined (__stub___sysconf) -choke me -#else -f = sysconf; -#endif - +return f != sysconf; ; return 0; } @@ -5049,17 +5103,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define daemon to an innocuous variant, in case <limits.h> declares daemon. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define daemon innocuous_daemon + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char daemon (); below. */ -#include <assert.h> + which can conflict with char daemon (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef daemon + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char daemon (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_daemon) || defined (__stub___daemon) +choke me +#else +char (*f) () = daemon; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5070,15 +5150,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_daemon) || defined (__stub___daemon) -choke me -#else -f = daemon; -#endif - +return f != daemon; ; return 0; } @@ -5124,17 +5196,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define strsep to an innocuous variant, in case <limits.h> declares strsep. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define strsep innocuous_strsep + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strsep (); below. */ -#include <assert.h> + which can conflict with char strsep (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef strsep + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strsep (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_strsep) || defined (__stub___strsep) +choke me +#else +char (*f) () = strsep; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5145,15 +5243,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_strsep) || defined (__stub___strsep) -choke me -#else -f = strsep; -#endif - +return f != strsep; ; return 0; } @@ -5199,17 +5289,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define strerror to an innocuous variant, in case <limits.h> declares strerror. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define strerror innocuous_strerror + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strerror (); below. */ -#include <assert.h> + which can conflict with char strerror (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef strerror + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strerror (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_strerror) || defined (__stub___strerror) +choke me +#else +char (*f) () = strerror; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5220,15 +5336,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_strerror) || defined (__stub___strerror) -choke me -#else -f = strerror; -#endif - +return f != strerror; ; return 0; } @@ -5275,17 +5383,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define flockfile to an innocuous variant, in case <limits.h> declares flockfile. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define flockfile innocuous_flockfile + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char flockfile (); below. */ -#include <assert.h> + which can conflict with char flockfile (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef flockfile + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char flockfile (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_flockfile) || defined (__stub___flockfile) +choke me +#else +char (*f) () = flockfile; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5296,15 +5430,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_flockfile) || defined (__stub___flockfile) -choke me -#else -f = flockfile; -#endif - +return f != flockfile; ; return 0; } @@ -5438,17 +5564,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define catgets to an innocuous variant, in case <limits.h> declares catgets. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define catgets innocuous_catgets + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char catgets (); below. */ -#include <assert.h> + which can conflict with char catgets (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef catgets + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char catgets (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_catgets) || defined (__stub___catgets) +choke me +#else +char (*f) () = catgets; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -5459,15 +5611,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_catgets) || defined (__stub___catgets) -choke me -#else -f = catgets; -#endif - +return f != catgets; ; return 0; } @@ -6852,7 +6996,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 6855 "configure"' > conftest.$ac_ext + echo '#line 6999 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7395,7 +7539,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:7398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:7542: \"$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 @@ -8758,17 +8902,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define dlopen innocuous_dlopen + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. */ -#include <assert.h> + which can conflict with char dlopen (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef dlopen + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_dlopen) || defined (__stub___dlopen) +choke me +#else +char (*f) () = dlopen; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -8779,15 +8949,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dlopen) || defined (__stub___dlopen) -choke me -#else -f = dlopen; -#endif - +return f != dlopen; ; return 0; } @@ -8825,17 +8987,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define shl_load innocuous_shl_load + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. */ -#include <assert.h> + which can conflict with char shl_load (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef shl_load + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char shl_load (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shl_load) || defined (__stub___shl_load) +choke me +#else +char (*f) () = shl_load; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -8846,15 +9034,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_shl_load) || defined (__stub___shl_load) -choke me -#else -f = shl_load; -#endif - +return f != shl_load; ; return 0; } @@ -9044,7 +9224,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9047 "configure" +#line 9227 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9142,7 +9322,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9145 "configure" +#line 9325 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11072,17 +11252,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getipnodebyname to an innocuous variant, in case <limits.h> declares getipnodebyname. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getipnodebyname innocuous_getipnodebyname + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getipnodebyname (); below. */ -#include <assert.h> + which can conflict with char getipnodebyname (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getipnodebyname + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getipnodebyname (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getipnodebyname) || defined (__stub___getipnodebyname) +choke me +#else +char (*f) () = getipnodebyname; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11093,15 +11299,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getipnodebyname) || defined (__stub___getipnodebyname) -choke me -#else -f = getipnodebyname; -#endif - +return f != getipnodebyname; ; return 0; } @@ -11142,17 +11340,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getnameinfo to an innocuous variant, in case <limits.h> declares getnameinfo. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getnameinfo innocuous_getnameinfo + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getnameinfo (); below. */ -#include <assert.h> + which can conflict with char getnameinfo (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getnameinfo + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getnameinfo (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo) +choke me +#else +char (*f) () = getnameinfo; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11163,15 +11387,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo) -choke me -#else -f = getnameinfo; -#endif - +return f != getnameinfo; ; return 0; } @@ -11212,17 +11428,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getaddrinfo to an innocuous variant, in case <limits.h> declares getaddrinfo. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getaddrinfo innocuous_getaddrinfo + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getaddrinfo (); below. */ -#include <assert.h> + which can conflict with char getaddrinfo (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getaddrinfo + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getaddrinfo (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) +choke me +#else +char (*f) () = getaddrinfo; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11233,15 +11475,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo) -choke me -#else -f = getaddrinfo; -#endif - +return f != getaddrinfo; ; return 0; } @@ -11286,17 +11520,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define gai_strerror to an innocuous variant, in case <limits.h> declares gai_strerror. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define gai_strerror innocuous_gai_strerror + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gai_strerror (); below. */ -#include <assert.h> + which can conflict with char gai_strerror (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef gai_strerror + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gai_strerror (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror) +choke me +#else +char (*f) () = gai_strerror; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11307,15 +11567,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror) -choke me -#else -f = gai_strerror; -#endif - +return f != gai_strerror; ; return 0; } @@ -11360,17 +11612,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define pselect to an innocuous variant, in case <limits.h> declares pselect. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define pselect innocuous_pselect + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char pselect (); below. */ -#include <assert.h> + which can conflict with char pselect (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef pselect + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pselect (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_pselect) || defined (__stub___pselect) +choke me +#else +char (*f) () = pselect; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11381,15 +11659,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_pselect) || defined (__stub___pselect) -choke me -#else -f = pselect; -#endif - +return f != pselect; ; return 0; } @@ -11431,17 +11701,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define gettimeofday to an innocuous variant, in case <limits.h> declares gettimeofday. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define gettimeofday innocuous_gettimeofday + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettimeofday (); below. */ -#include <assert.h> + which can conflict with char gettimeofday (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef gettimeofday + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gettimeofday (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) +choke me +#else +char (*f) () = gettimeofday; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11452,15 +11748,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gettimeofday) || defined (__stub___gettimeofday) -choke me -#else -f = gettimeofday; -#endif - +return f != gettimeofday; ; return 0; } @@ -11502,17 +11790,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define strndup to an innocuous variant, in case <limits.h> declares strndup. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define strndup innocuous_strndup + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strndup (); below. */ -#include <assert.h> + which can conflict with char strndup (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef strndup + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strndup (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_strndup) || defined (__stub___strndup) +choke me +#else +char (*f) () = strndup; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11523,15 +11837,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_strndup) || defined (__stub___strndup) -choke me -#else -f = strndup; -#endif - +return f != strndup; ; return 0; } @@ -11609,17 +11915,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define strsep to an innocuous variant, in case <limits.h> declares strsep. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define strsep innocuous_strsep + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strsep (); below. */ -#include <assert.h> + which can conflict with char strsep (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef strsep + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strsep (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_strsep) || defined (__stub___strsep) +choke me +#else +char (*f) () = strsep; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11630,15 +11962,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_strsep) || defined (__stub___strsep) -choke me -#else -f = strsep; -#endif - +return f != strsep; ; return 0; } @@ -11679,17 +12003,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define vsnprintf to an innocuous variant, in case <limits.h> declares vsnprintf. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define vsnprintf innocuous_vsnprintf + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char vsnprintf (); below. */ -#include <assert.h> + which can conflict with char vsnprintf (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef vsnprintf + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char vsnprintf (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_vsnprintf) || defined (__stub___vsnprintf) +choke me +#else +char (*f) () = vsnprintf; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11700,15 +12050,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_vsnprintf) || defined (__stub___vsnprintf) -choke me -#else -f = vsnprintf; -#endif - +return f != vsnprintf; ; return 0; } @@ -11756,17 +12098,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define strerror to an innocuous variant, in case <limits.h> declares strerror. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define strerror innocuous_strerror + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char strerror (); below. */ -#include <assert.h> + which can conflict with char strerror (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef strerror + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strerror (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_strerror) || defined (__stub___strerror) +choke me +#else +char (*f) () = strerror; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11777,15 +12145,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_strerror) || defined (__stub___strerror) -choke me -#else -f = strerror; -#endif - +return f != strerror; ; return 0; } @@ -11877,17 +12237,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define chroot to an innocuous variant, in case <limits.h> declares chroot. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define chroot innocuous_chroot + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char chroot (); below. */ -#include <assert.h> + which can conflict with char chroot (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef chroot + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char chroot (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_chroot) || defined (__stub___chroot) +choke me +#else +char (*f) () = chroot; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -11898,15 +12284,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_chroot) || defined (__stub___chroot) -choke me -#else -f = chroot; -#endif - +return f != chroot; ; return 0; } @@ -12132,17 +12510,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getgrouplist to an innocuous variant, in case <limits.h> declares getgrouplist. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getgrouplist innocuous_getgrouplist + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getgrouplist (); below. */ -#include <assert.h> + which can conflict with char getgrouplist (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getgrouplist + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getgrouplist (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getgrouplist) || defined (__stub___getgrouplist) +choke me +#else +char (*f) () = getgrouplist; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -12153,15 +12557,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getgrouplist) || defined (__stub___getgrouplist) -choke me -#else -f = getgrouplist; -#endif - +return f != getgrouplist; ; return 0; } @@ -12251,17 +12647,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setgroupent to an innocuous variant, in case <limits.h> declares setgroupent. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setgroupent innocuous_setgroupent + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setgroupent (); below. */ -#include <assert.h> + which can conflict with char setgroupent (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setgroupent + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setgroupent (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setgroupent) || defined (__stub___setgroupent) +choke me +#else +char (*f) () = setgroupent; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -12272,15 +12694,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setgroupent) || defined (__stub___setgroupent) -choke me -#else -f = setgroupent; -#endif - +return f != setgroupent; ; return 0; } @@ -12325,17 +12739,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getnetbyaddr_r to an innocuous variant, in case <limits.h> declares getnetbyaddr_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getnetbyaddr_r innocuous_getnetbyaddr_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getnetbyaddr_r (); below. */ -#include <assert.h> + which can conflict with char getnetbyaddr_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getnetbyaddr_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getnetbyaddr_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getnetbyaddr_r) || defined (__stub___getnetbyaddr_r) +choke me +#else +char (*f) () = getnetbyaddr_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -12346,15 +12786,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getnetbyaddr_r) || defined (__stub___getnetbyaddr_r) -choke me -#else -f = getnetbyaddr_r; -#endif - +return f != getnetbyaddr_r; ; return 0; } @@ -12389,6 +12821,8 @@ if test $ac_cv_func_getnetbyaddr_r = yes; then #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct netent * getnetbyaddr_r(long net, int type, struct netent *result, char *buffer, @@ -12441,6 +12875,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getnetbyaddr_r (unsigned long int, int, struct netent *, char *, size_t, struct netent **, int *); @@ -12492,6 +12928,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int getnetbyaddr_r(int, int, struct netent *, struct netent_data *); @@ -12538,6 +12976,8 @@ cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getnetbyaddr_r (long, int, struct netent *, struct netent_data *); @@ -12627,17 +13067,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setnetent_r to an innocuous variant, in case <limits.h> declares setnetent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setnetent_r innocuous_setnetent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setnetent_r (); below. */ -#include <assert.h> + which can conflict with char setnetent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setnetent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setnetent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setnetent_r) || defined (__stub___setnetent_r) +choke me +#else +char (*f) () = setnetent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -12648,15 +13114,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setnetent_r) || defined (__stub___setnetent_r) -choke me -#else -f = setnetent_r; -#endif - +return f != setnetent_r; ; return 0; } @@ -12688,6 +13146,8 @@ if test $ac_cv_func_setnetent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void setnetent_r (int); @@ -12730,6 +13190,8 @@ cat >conftest.$ac_ext <<_ACEOF #include "confdefs.h" #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int setnetent_r(int, struct netent_data *); @@ -12792,17 +13254,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define endnetent_r to an innocuous variant, in case <limits.h> declares endnetent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define endnetent_r innocuous_endnetent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char endnetent_r (); below. */ -#include <assert.h> + which can conflict with char endnetent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef endnetent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char endnetent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_endnetent_r) || defined (__stub___endnetent_r) +choke me +#else +char (*f) () = endnetent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -12813,15 +13301,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_endnetent_r) || defined (__stub___endnetent_r) -choke me -#else -f = endnetent_r; -#endif - +return f != endnetent_r; ; return 0; } @@ -12855,6 +13335,8 @@ if test $ac_cv_func_endnetent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void endnetent_r (void); @@ -12897,6 +13379,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int endnetent_r(struct netent_data *); @@ -12939,6 +13423,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void endnetent_r(struct netent_data *); @@ -13001,17 +13487,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getgrnam_r to an innocuous variant, in case <limits.h> declares getgrnam_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getgrnam_r innocuous_getgrnam_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getgrnam_r (); below. */ -#include <assert.h> + which can conflict with char getgrnam_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getgrnam_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getgrnam_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getgrnam_r) || defined (__stub___getgrnam_r) +choke me +#else +char (*f) () = getgrnam_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13022,15 +13534,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getgrnam_r) || defined (__stub___getgrnam_r) -choke me -#else -f = getgrnam_r; -#endif - +return f != getgrnam_r; ; return 0; } @@ -13074,17 +13578,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getgrgid_r to an innocuous variant, in case <limits.h> declares getgrgid_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getgrgid_r innocuous_getgrgid_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getgrgid_r (); below. */ -#include <assert.h> + which can conflict with char getgrgid_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getgrgid_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getgrgid_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getgrgid_r) || defined (__stub___getgrgid_r) +choke me +#else +char (*f) () = getgrgid_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13095,15 +13625,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getgrgid_r) || defined (__stub___getgrgid_r) -choke me -#else -f = getgrgid_r; -#endif - +return f != getgrgid_r; ; return 0; } @@ -13148,17 +13670,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getgrent_r to an innocuous variant, in case <limits.h> declares getgrent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getgrent_r innocuous_getgrent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getgrent_r (); below. */ -#include <assert.h> + which can conflict with char getgrent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getgrent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getgrent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getgrent_r) || defined (__stub___getgrent_r) +choke me +#else +char (*f) () = getgrent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13169,15 +13717,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getgrent_r) || defined (__stub___getgrent_r) -choke me -#else -f = getgrent_r; -#endif - +return f != getgrent_r; ; return 0; } @@ -13276,17 +13816,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define endgrent_r to an innocuous variant, in case <limits.h> declares endgrent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define endgrent_r innocuous_endgrent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char endgrent_r (); below. */ -#include <assert.h> + which can conflict with char endgrent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef endgrent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char endgrent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_endgrent_r) || defined (__stub___endgrent_r) +choke me +#else +char (*f) () = endgrent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13297,15 +13863,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_endgrent_r) || defined (__stub___endgrent_r) -choke me -#else -f = endgrent_r; -#endif - +return f != endgrent_r; ; return 0; } @@ -13357,17 +13915,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setgrent_r to an innocuous variant, in case <limits.h> declares setgrent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setgrent_r innocuous_setgrent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setgrent_r (); below. */ -#include <assert.h> + which can conflict with char setgrent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setgrent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setgrent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setgrent_r) || defined (__stub___setgrent_r) +choke me +#else +char (*f) () = setgrent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13378,15 +13962,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setgrent_r) || defined (__stub___setgrent_r) -choke me -#else -f = setgrent_r; -#endif - +return f != setgrent_r; ; return 0; } @@ -13437,17 +14013,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define gethostbyname_r to an innocuous variant, in case <limits.h> declares gethostbyname_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define gethostbyname_r innocuous_gethostbyname_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname_r (); below. */ -#include <assert.h> + which can conflict with char gethostbyname_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef gethostbyname_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char gethostbyname_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname_r) || defined (__stub___gethostbyname_r) +choke me +#else +char (*f) () = gethostbyname_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13458,15 +14060,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_gethostbyname_r) || defined (__stub___gethostbyname_r) -choke me -#else -f = gethostbyname_r; -#endif - +return f != gethostbyname_r; ; return 0; } @@ -13498,6 +14092,8 @@ if test $ac_cv_func_gethostbyname_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct hostent *gethostbyname_r (const char *name, struct hostent *hp, char *buf, int len, int *h_errnop) {} @@ -13547,6 +14143,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int gethostbyname_r(const char *name, struct hostent *result, @@ -13596,6 +14194,7 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC #define __USE_MISC #include <netdb.h> extern int gethostbyname_r (const char *, @@ -13682,17 +14281,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define endhostent_r to an innocuous variant, in case <limits.h> declares endhostent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define endhostent_r innocuous_endhostent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char endhostent_r (); below. */ -#include <assert.h> + which can conflict with char endhostent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef endhostent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char endhostent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_endhostent_r) || defined (__stub___endhostent_r) +choke me +#else +char (*f) () = endhostent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13703,15 +14328,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_endhostent_r) || defined (__stub___endhostent_r) -choke me -#else -f = endhostent_r; -#endif - +return f != endhostent_r; ; return 0; } @@ -13745,6 +14362,8 @@ if test $ac_cv_func_endhostent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int endhostent_r(struct hostent_data *buffer); @@ -13787,6 +14406,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void endhostent_r(struct hostent_data *ht_data); @@ -13830,6 +14451,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void endhostent_r(void); @@ -13895,17 +14518,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define sethostent_r to an innocuous variant, in case <limits.h> declares sethostent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define sethostent_r innocuous_sethostent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char sethostent_r (); below. */ -#include <assert.h> + which can conflict with char sethostent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef sethostent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char sethostent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_sethostent_r) || defined (__stub___sethostent_r) +choke me +#else +char (*f) () = sethostent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -13916,15 +14565,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_sethostent_r) || defined (__stub___sethostent_r) -choke me -#else -f = sethostent_r; -#endif - +return f != sethostent_r; ; return 0; } @@ -13958,6 +14599,8 @@ if test $ac_cv_func_sethostent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void sethostent_r(int flag, struct hostent_data *ht_data); #ifdef F77_DUMMY_MAIN @@ -13997,6 +14640,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int sethostent_r(int flag, struct hostent_data *ht_data); #ifdef F77_DUMMY_MAIN @@ -14036,6 +14681,8 @@ cat >conftest.$ac_ext <<_ACEOF #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void sethostent_r (int); #ifdef F77_DUMMY_MAIN @@ -14239,17 +14886,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getnetgrent_r to an innocuous variant, in case <limits.h> declares getnetgrent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getnetgrent_r innocuous_getnetgrent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getnetgrent_r (); below. */ -#include <assert.h> + which can conflict with char getnetgrent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getnetgrent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getnetgrent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getnetgrent_r) || defined (__stub___getnetgrent_r) +choke me +#else +char (*f) () = getnetgrent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -14260,15 +14933,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getnetgrent_r) || defined (__stub___getnetgrent_r) -choke me -#else -f = getnetgrent_r; -#endif - +return f != getnetgrent_r; ; return 0; } @@ -14300,6 +14965,8 @@ if test $ac_cv_func_getnetgrent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getnetgrent_r(char **m, char **u, char **d, char *b, int l) {} @@ -14346,6 +15013,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getnetgrent_r(char **m, char **u, char **d, char *b, size_t l) {} @@ -14392,6 +15061,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int getnetgrent_r( char **, char **, char **, void **); @@ -14470,17 +15141,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define endnetgrent_r to an innocuous variant, in case <limits.h> declares endnetgrent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define endnetgrent_r innocuous_endnetgrent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char endnetgrent_r (); below. */ -#include <assert.h> + which can conflict with char endnetgrent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef endnetgrent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char endnetgrent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_endnetgrent_r) || defined (__stub___endnetgrent_r) +choke me +#else +char (*f) () = endnetgrent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -14491,15 +15188,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_endnetgrent_r) || defined (__stub___endnetgrent_r) -choke me -#else -f = endnetgrent_r; -#endif - +return f != endnetgrent_r; ; return 0; } @@ -14554,17 +15243,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setnetgrent_r to an innocuous variant, in case <limits.h> declares setnetgrent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setnetgrent_r innocuous_setnetgrent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setnetgrent_r (); below. */ -#include <assert.h> + which can conflict with char setnetgrent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setnetgrent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setnetgrent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setnetgrent_r) || defined (__stub___setnetgrent_r) +choke me +#else +char (*f) () = setnetgrent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -14575,15 +15290,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setnetgrent_r) || defined (__stub___setnetgrent_r) -choke me -#else -f = setnetgrent_r; -#endif - +return f != setnetgrent_r; ; return 0; } @@ -14641,17 +15348,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define innetgr_r to an innocuous variant, in case <limits.h> declares innetgr_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define innetgr_r innocuous_innetgr_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char innetgr_r (); below. */ -#include <assert.h> + which can conflict with char innetgr_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef innetgr_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char innetgr_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_innetgr_r) || defined (__stub___innetgr_r) +choke me +#else +char (*f) () = innetgr_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -14662,15 +15395,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_innetgr_r) || defined (__stub___innetgr_r) -choke me -#else -f = innetgr_r; -#endif - +return f != innetgr_r; ; return 0; } @@ -14715,17 +15440,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getprotoent_r to an innocuous variant, in case <limits.h> declares getprotoent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getprotoent_r innocuous_getprotoent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getprotoent_r (); below. */ -#include <assert.h> + which can conflict with char getprotoent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getprotoent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getprotoent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getprotoent_r) || defined (__stub___getprotoent_r) +choke me +#else +char (*f) () = getprotoent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -14736,15 +15487,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getprotoent_r) || defined (__stub___getprotoent_r) -choke me -#else -f = getprotoent_r; -#endif - +return f != getprotoent_r; ; return 0; } @@ -14776,6 +15519,8 @@ if test $ac_cv_func_getprotoent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct protoent *getprotoent_r(struct protoent *result, char *buffer, int buflen) {} @@ -14825,6 +15570,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getprotoent_r (struct protoent *, char *, size_t, struct protoent **); @@ -14903,17 +15650,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define endprotoent_r to an innocuous variant, in case <limits.h> declares endprotoent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define endprotoent_r innocuous_endprotoent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char endprotoent_r (); below. */ -#include <assert.h> + which can conflict with char endprotoent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef endprotoent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char endprotoent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_endprotoent_r) || defined (__stub___endprotoent_r) +choke me +#else +char (*f) () = endprotoent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -14924,15 +15697,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_endprotoent_r) || defined (__stub___endprotoent_r) -choke me -#else -f = endprotoent_r; -#endif - +return f != endprotoent_r; ; return 0; } @@ -14966,6 +15731,8 @@ if test $ac_cv_func_endprotoent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void endprotoent_r(void); @@ -15027,17 +15794,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setprotoent_r to an innocuous variant, in case <limits.h> declares setprotoent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setprotoent_r innocuous_setprotoent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setprotoent_r (); below. */ -#include <assert.h> + which can conflict with char setprotoent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setprotoent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setprotoent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setprotoent_r) || defined (__stub___setprotoent_r) +choke me +#else +char (*f) () = setprotoent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15048,15 +15841,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setprotoent_r) || defined (__stub___setprotoent_r) -choke me -#else -f = setprotoent_r; -#endif - +return f != setprotoent_r; ; return 0; } @@ -15090,6 +15875,8 @@ if test $ac_cv_func_setprotoent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void setprotoent_r __P((int)); @@ -15145,17 +15932,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getpwent_r to an innocuous variant, in case <limits.h> declares getpwent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getpwent_r innocuous_getpwent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getpwent_r (); below. */ -#include <assert.h> + which can conflict with char getpwent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getpwent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getpwent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getpwent_r) || defined (__stub___getpwent_r) +choke me +#else +char (*f) () = getpwent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15166,15 +15979,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getpwent_r) || defined (__stub___getpwent_r) -choke me -#else -f = getpwent_r; -#endif - +return f != getpwent_r; ; return 0; } @@ -15281,17 +16086,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define endpwent_r to an innocuous variant, in case <limits.h> declares endpwent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define endpwent_r innocuous_endpwent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char endpwent_r (); below. */ -#include <assert.h> + which can conflict with char endpwent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef endpwent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char endpwent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_endpwent_r) || defined (__stub___endpwent_r) +choke me +#else +char (*f) () = endpwent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15302,15 +16133,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_endpwent_r) || defined (__stub___endpwent_r) -choke me -#else -f = endpwent_r; -#endif - +return f != endpwent_r; ; return 0; } @@ -15403,17 +16226,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setpassent_r to an innocuous variant, in case <limits.h> declares setpassent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setpassent_r innocuous_setpassent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setpassent_r (); below. */ -#include <assert.h> + which can conflict with char setpassent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setpassent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setpassent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setpassent_r) || defined (__stub___setpassent_r) +choke me +#else +char (*f) () = setpassent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15424,15 +16273,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setpassent_r) || defined (__stub___setpassent_r) -choke me -#else -f = setpassent_r; -#endif - +return f != setpassent_r; ; return 0; } @@ -15476,17 +16317,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setpassent to an innocuous variant, in case <limits.h> declares setpassent. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setpassent innocuous_setpassent + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setpassent (); below. */ -#include <assert.h> + which can conflict with char setpassent (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setpassent + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setpassent (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setpassent) || defined (__stub___setpassent) +choke me +#else +char (*f) () = setpassent; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15497,15 +16364,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setpassent) || defined (__stub___setpassent) -choke me -#else -f = setpassent; -#endif - +return f != setpassent; ; return 0; } @@ -15550,17 +16409,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setpwent_r to an innocuous variant, in case <limits.h> declares setpwent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setpwent_r innocuous_setpwent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setpwent_r (); below. */ -#include <assert.h> + which can conflict with char setpwent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setpwent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setpwent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setpwent_r) || defined (__stub___setpwent_r) +choke me +#else +char (*f) () = setpwent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15571,15 +16456,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setpwent_r) || defined (__stub___setpwent_r) -choke me -#else -f = setpwent_r; -#endif - +return f != setpwent_r; ; return 0; } @@ -15712,17 +16589,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getpwnam_r to an innocuous variant, in case <limits.h> declares getpwnam_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getpwnam_r innocuous_getpwnam_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getpwnam_r (); below. */ -#include <assert.h> + which can conflict with char getpwnam_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getpwnam_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getpwnam_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getpwnam_r) || defined (__stub___getpwnam_r) +choke me +#else +char (*f) () = getpwnam_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15733,15 +16636,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getpwnam_r) || defined (__stub___getpwnam_r) -choke me -#else -f = getpwnam_r; -#endif - +return f != getpwnam_r; ; return 0; } @@ -15785,17 +16680,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getpwuid_r to an innocuous variant, in case <limits.h> declares getpwuid_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getpwuid_r innocuous_getpwuid_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getpwuid_r (); below. */ -#include <assert.h> + which can conflict with char getpwuid_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getpwuid_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getpwuid_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getpwuid_r) || defined (__stub___getpwuid_r) +choke me +#else +char (*f) () = getpwuid_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15806,15 +16727,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getpwuid_r) || defined (__stub___getpwuid_r) -choke me -#else -f = getpwuid_r; -#endif - +return f != getpwuid_r; ; return 0; } @@ -15859,17 +16772,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define getservent_r to an innocuous variant, in case <limits.h> declares getservent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define getservent_r innocuous_getservent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getservent_r (); below. */ -#include <assert.h> + which can conflict with char getservent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef getservent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getservent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_getservent_r) || defined (__stub___getservent_r) +choke me +#else +char (*f) () = getservent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -15880,15 +16819,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_getservent_r) || defined (__stub___getservent_r) -choke me -#else -f = getservent_r; -#endif - +return f != getservent_r; ; return 0; } @@ -15920,6 +16851,8 @@ if test $ac_cv_func_getservent_r = yes; then #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct servent * getservent_r(struct servent *result, char *buffer, int buflen) {} @@ -15967,6 +16900,8 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getservent_r (struct servent *, char *, size_t, struct servent **); @@ -16043,17 +16978,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define endservent_r to an innocuous variant, in case <limits.h> declares endservent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define endservent_r innocuous_endservent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char endservent_r (); below. */ -#include <assert.h> + which can conflict with char endservent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef endservent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char endservent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_endservent_r) || defined (__stub___endservent_r) +choke me +#else +char (*f) () = endservent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -16064,15 +17025,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_endservent_r) || defined (__stub___endservent_r) -choke me -#else -f = endservent_r; -#endif - +return f != endservent_r; ; return 0; } @@ -16106,6 +17059,8 @@ if test $ac_cv_func_endservent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void endservent_r(void); @@ -16167,17 +17122,43 @@ else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" #include "confdefs.h" +/* From autoconf 2.57 */ +/* Define setservent_r to an innocuous variant, in case <limits.h> declares setservent_r. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define setservent_r innocuous_setservent_r + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char setservent_r (); below. */ -#include <assert.h> + which can conflict with char setservent_r (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef setservent_r + /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" +{ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setservent_r (); -char (*f) (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_setservent_r) || defined (__stub___setservent_r) +choke me +#else +char (*f) () = setservent_r; +#endif +#ifdef __cplusplus +} +#endif #ifdef F77_DUMMY_MAIN # ifdef __cplusplus @@ -16188,15 +17169,7 @@ char (*f) (); int main () { -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_setservent_r) || defined (__stub___setservent_r) -choke me -#else -f = setservent_r; -#endif - +return f != setservent_r; ; return 0; } @@ -16230,6 +17203,8 @@ if test $ac_cv_func_setservent_r = yes; then #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void setservent_r(int); diff --git a/lib/bind/configure.in b/lib/bind/configure.in index 912afbe3..76e43f8e 100644 --- a/lib/bind/configure.in +++ b/lib/bind/configure.in @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -AC_REVISION($Revision: 1.83.2.2 $) +AC_REVISION($Revision: 1.83.2.2.4.1 $) AC_INIT(resolv/herror.c) AC_PREREQ(2.13) @@ -1353,6 +1353,8 @@ AC_TRY_COMPILE( #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct netent * getnetbyaddr_r(long net, int type, struct netent *result, char *buffer, @@ -1375,6 +1377,8 @@ AC_TRY_COMPILE( #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getnetbyaddr_r (unsigned long int, int, struct netent *, char *, size_t, struct netent **, int *); @@ -1396,6 +1400,8 @@ AC_TRY_COMPILE( #undef _REENTRANT #define _REENTRANT #define _OSF_SOURCE +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int getnetbyaddr_r(int, int, struct netent *, struct netent_data *); ], @@ -1412,6 +1418,8 @@ GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T int" NETENT_DATA="#define NETENT_DATA 1" ], AC_TRY_COMPILE( +#undef __USE_MISC +#define __USE_MISC [#include <netdb.h> int getnetbyaddr_r (long, int, struct netent *, struct netent_data *); ], @@ -1458,6 +1466,8 @@ AC_SUBST(NETENT_DATA) AC_CHECK_FUNC(setnetent_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void setnetent_r (int); ] ,[return (0);],[ @@ -1468,6 +1478,8 @@ NET_R_SET_RETURN="#define NET_R_SET_RETURN void" AC_TRY_COMPILE( [ #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int setnetent_r(int, struct netent_data *); ] ,[return (0);],[ @@ -1491,6 +1503,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void endnetent_r (void); ] ,[return (0);],[ @@ -1501,6 +1515,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int endnetent_r(struct netent_data *); ] ,[return (0);],[ @@ -1511,6 +1527,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void endnetent_r(struct netent_data *); ] ,[return (0);],[ @@ -1579,6 +1597,8 @@ AC_SUBST(GROUP_R_SET_RETURN) AC_CHECK_FUNC(gethostbyname_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct hostent *gethostbyname_r (const char *name, struct hostent *hp, char *buf, int len, int *h_errnop) {} @@ -1597,6 +1617,8 @@ HOSTENT_DATA="#undef HOSTENT_DATA" ] , AC_TRY_COMPILE([ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int gethostbyname_r(const char *name, struct hostent *result, @@ -1613,6 +1635,7 @@ HOST_R_SETANSWER="#undef HOST_R_SETANSWER" HOSTENT_DATA="#define HOSTENT_DATA 1" ], AC_TRY_COMPILE([ +#undef __USE_MISC #define __USE_MISC #include <netdb.h> extern int gethostbyname_r (const char *, @@ -1657,6 +1680,8 @@ AC_CHECK_FUNC(endhostent_r, AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int endhostent_r(struct hostent_data *buffer); ], , @@ -1667,6 +1692,8 @@ HOST_R_ENT_ARGS="#define HOST_R_ENT_ARGS struct hostent_data *hdptr" AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void endhostent_r(struct hostent_data *ht_data); ],[],[ @@ -1677,6 +1704,8 @@ HOST_R_ENT_ARGS="#define HOST_R_ENT_ARGS struct hostent_data *hdptr" AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void endhostent_r(void); ],[],[ @@ -1700,6 +1729,8 @@ AC_CHECK_FUNC(sethostent_r, AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern void sethostent_r(int flag, struct hostent_data *ht_data);],[], [HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT /*empty*/" @@ -1707,6 +1738,8 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"], AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int sethostent_r(int flag, struct hostent_data *ht_data);],[], [HOST_R_SET_RESULT="#define HOST_R_SET_RESULT 0" @@ -1714,6 +1747,8 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN int"], AC_TRY_COMPILE([ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void sethostent_r (int);],[], [HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT" @@ -1769,6 +1804,8 @@ AC_SUBST(SETGRENT_VOID) AC_CHECK_FUNC(getnetgrent_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getnetgrent_r(char **m, char **u, char **d, char *b, int l) {} ] @@ -1785,6 +1822,8 @@ NGR_R_RETURN="#define NGR_R_RETURN int" , AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getnetgrent_r(char **m, char **u, char **d, char *b, size_t l) {} ] @@ -1801,6 +1840,8 @@ NGR_R_RETURN="#define NGR_R_RETURN int" , AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> extern int getnetgrent_r( char **, char **, char **, void **); ] @@ -1874,6 +1915,8 @@ AC_CHECK_FUNC(innetgr_r,,AC_DEFINE(NEED_INNETGR_R)) AC_CHECK_FUNC(getprotoent_r, AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct protoent *getprotoent_r(struct protoent *result, char *buffer, int buflen) {} @@ -1893,6 +1936,8 @@ PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *" , AC_TRY_COMPILE( [ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getprotoent_r (struct protoent *, char *, size_t, struct protoent **); @@ -1934,6 +1979,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void endprotoent_r(void); ] @@ -1959,6 +2006,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void setprotoent_r __P((int)); ],[], @@ -2061,6 +2110,8 @@ AC_CHECK_FUNC(getpwuid_r,,AC_DEFINE(NEED_GETPWUID_R)) AC_CHECK_FUNC(getservent_r, AC_TRY_COMPILE([ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> struct servent * getservent_r(struct servent *result, char *buffer, int buflen) {} @@ -2076,6 +2127,8 @@ SERV_R_RETURN="#define SERV_R_RETURN struct servent *" ] , AC_TRY_COMPILE([ +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> int getservent_r (struct servent *, char *, size_t, struct servent **); @@ -2114,6 +2167,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void endservent_r(void); ] @@ -2140,6 +2195,8 @@ AC_TRY_COMPILE( [ #undef _REENTRANT #define _REENTRANT +#undef __USE_MISC +#define __USE_MISC #include <netdb.h> void setservent_r(int); ] diff --git a/lib/bind/make/rules.in b/lib/bind/make/rules.in index 5ca38fe8..4a896330 100644 --- a/lib/bind/make/rules.in +++ b/lib/bind/make/rules.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: rules.in,v 1.3.2.1 2002/08/08 06:31:24 marka Exp $ +# $Id: rules.in,v 1.3.2.1.4.1 2003/02/17 01:35:20 marka Exp $ ### ### Common Makefile rules for BIND 9. @@ -41,7 +41,7 @@ MAKEDEFS= 'DESTDIR=${DESTDIR}' @SET_MAKE@ top_builddir = @BIND9_TOP_BUILDDIR@ -top_srcdir = @top_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ ### ### All @@ -102,7 +102,7 @@ STD_CWARNINGS = @STD_CWARNINGS@ .SUFFIXES: .SUFFIXES: .c .@O@ -ALWAYS_INCLUDES = -I${top_builddir} -I${top_srcdir}/@PORT_INCLUDE@ +ALWAYS_INCLUDES = -I${top_builddir} -I${abs_top_srcdir}/@PORT_INCLUDE@ ALWAYS_DEFINES = @ALWAYS_DEFINES@ ALWAYS_WARNINGS = diff --git a/lib/dns/adb.c b/lib/dns/adb.c index 85612d4b..4fb3be4a 100644 --- a/lib/dns/adb.c +++ b/lib/dns/adb.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 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: adb.c,v 1.181.2.4 2002/08/05 06:57:11 marka Exp $ */ +/* $Id: adb.c,v 1.181.2.4.4.2 2003/02/17 07:05:07 marka Exp $ */ /* * Implementation notes @@ -279,7 +279,7 @@ static inline void free_adbzoneinfo(dns_adb_t *, dns_adbzoneinfo_t **); static inline dns_adbentry_t *new_adbentry(dns_adb_t *); static inline void free_adbentry(dns_adb_t *, dns_adbentry_t **); static inline dns_adbfind_t *new_adbfind(dns_adb_t *); -static inline void free_adbfind(dns_adb_t *, dns_adbfind_t **); +static inline isc_boolean_t free_adbfind(dns_adb_t *, dns_adbfind_t **); static inline dns_adbaddrinfo_t *new_adbaddrinfo(dns_adb_t *, dns_adbentry_t *, in_port_t); static inline dns_adbfetch_t *new_adbfetch(dns_adb_t *); @@ -298,18 +298,18 @@ static void print_namehook_list(FILE *, const char *legend, isc_boolean_t debug); static void print_find_list(FILE *, dns_adbname_t *); static void print_fetch_list(FILE *, dns_adbname_t *); -static inline void dec_adb_irefcnt(dns_adb_t *); +static inline isc_boolean_t dec_adb_irefcnt(dns_adb_t *); static inline void inc_adb_erefcnt(dns_adb_t *); static inline void inc_entry_refcnt(dns_adb_t *, dns_adbentry_t *, isc_boolean_t); -static inline void dec_entry_refcnt(dns_adb_t *, dns_adbentry_t *, +static inline isc_boolean_t dec_entry_refcnt(dns_adb_t *, dns_adbentry_t *, isc_boolean_t); static inline void violate_locking_hierarchy(isc_mutex_t *, isc_mutex_t *); -static void clean_namehooks(dns_adb_t *, dns_adbnamehooklist_t *); +static isc_boolean_t clean_namehooks(dns_adb_t *, dns_adbnamehooklist_t *); static void clean_target(dns_adb_t *, dns_name_t *); static void clean_finds_at_name(dns_adbname_t *, isc_eventtype_t, unsigned int); -static void check_expire_namehooks(dns_adbname_t *, isc_stdtime_t); +static isc_boolean_t check_expire_namehooks(dns_adbname_t *, isc_stdtime_t); static void cancel_fetches_at_name(dns_adbname_t *); static isc_result_t dbfind_name(dns_adbname_t *, isc_stdtime_t, dns_rdatatype_t); @@ -319,13 +319,13 @@ static isc_result_t fetch_name_a6(dns_adbname_t *, isc_boolean_t); static inline void check_exit(dns_adb_t *); static void timer_cleanup(isc_task_t *, isc_event_t *); static void destroy(dns_adb_t *); -static void shutdown_names(dns_adb_t *); -static void shutdown_entries(dns_adb_t *); +static isc_boolean_t shutdown_names(dns_adb_t *); +static isc_boolean_t shutdown_entries(dns_adb_t *); static inline void link_name(dns_adb_t *, int, dns_adbname_t *); -static inline void unlink_name(dns_adb_t *, dns_adbname_t *); +static inline isc_boolean_t unlink_name(dns_adb_t *, dns_adbname_t *); static inline void link_entry(dns_adb_t *, int, dns_adbentry_t *); -static inline void unlink_entry(dns_adb_t *, dns_adbentry_t *); -static void kill_name(dns_adbname_t **, isc_eventtype_t); +static inline isc_boolean_t unlink_entry(dns_adb_t *, dns_adbentry_t *); +static isc_boolean_t kill_name(dns_adbname_t **, isc_eventtype_t); static void fetch_callback_a6(isc_task_t *, isc_event_t *); static isc_result_t dbfind_a6(dns_adbname_t *, isc_stdtime_t); @@ -671,9 +671,11 @@ import_a6(dns_a6context_t *a6ctx) { /* * Requires the name's bucket be locked. */ -static void +static isc_boolean_t kill_name(dns_adbname_t **n, isc_eventtype_t ev) { dns_adbname_t *name; + isc_boolean_t result = ISC_FALSE; + isc_boolean_t result4, result6; dns_adb_t *adb; INSIST(n != NULL); @@ -690,9 +692,11 @@ kill_name(dns_adbname_t **n, isc_eventtype_t ev) { * away now or not. */ if (NAME_DEAD(name) && !NAME_FETCH(name)) { - unlink_name(adb, name); + result = unlink_name(adb, name); free_adbname(adb, &name); - return; + if (result) + result = dec_adb_irefcnt(adb); + return (result); } /* @@ -700,29 +704,36 @@ kill_name(dns_adbname_t **n, isc_eventtype_t ev) { * in that they will always empty the list. */ clean_finds_at_name(name, ev, DNS_ADBFIND_ADDRESSMASK); - clean_namehooks(adb, &name->v4); - clean_namehooks(adb, &name->v6); + result4 = clean_namehooks(adb, &name->v4); + result6 = clean_namehooks(adb, &name->v6); clean_target(adb, &name->target); + result = ISC_TF(result4 || result6); /* * If fetches are running, cancel them. If none are running, we can * just kill the name here. */ if (!NAME_FETCH(name)) { - unlink_name(adb, name); + INSIST(result == ISC_FALSE); + result = unlink_name(adb, name); free_adbname(adb, &name); + if (result) + result = dec_adb_irefcnt(adb); } else { name->flags |= NAME_IS_DEAD; cancel_fetches_at_name(name); } + return (result); } /* * Requires the name's bucket be locked and no entry buckets be locked. */ -static void +static isc_boolean_t check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now) { dns_adb_t *adb; + isc_boolean_t result4 = ISC_FALSE; + isc_boolean_t result6 = ISC_FALSE; INSIST(DNS_ADBNAME_VALID(name)); adb = name->adb; @@ -734,7 +745,7 @@ check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now) { if (!NAME_FETCH_V4(name) && EXPIRE_OK(name->expire_v4, now)) { if (NAME_HAS_V4(name)) { DP(DEF_LEVEL, "expiring v4 for name %p", name); - clean_namehooks(adb, &name->v4); + result4 = clean_namehooks(adb, &name->v4); name->partial_result &= ~DNS_ADBFIND_INET; } name->expire_v4 = INT_MAX; @@ -746,7 +757,7 @@ check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now) { if (!NAME_FETCH_V6(name) && EXPIRE_OK(name->expire_v6, now)) { if (NAME_HAS_V6(name)) { DP(DEF_LEVEL, "expiring v6 for name %p", name); - clean_namehooks(adb, &name->v6); + result6 = clean_namehooks(adb, &name->v6); name->partial_result &= ~DNS_ADBFIND_INET6; } name->expire_v6 = INT_MAX; @@ -759,6 +770,7 @@ check_expire_namehooks(dns_adbname_t *name, isc_stdtime_t now) { clean_target(adb, &name->target); name->expire_target = INT_MAX; } + return (ISC_TF(result4 || result6)); } /* @@ -776,9 +788,10 @@ link_name(dns_adb_t *adb, int bucket, dns_adbname_t *name) { /* * Requires the name's bucket be locked. */ -static inline void +static inline isc_boolean_t unlink_name(dns_adb_t *adb, dns_adbname_t *name) { int bucket; + isc_boolean_t result = ISC_FALSE; bucket = name->lock_bucket; INSIST(bucket != DNS_ADB_INVALIDBUCKET); @@ -788,7 +801,8 @@ unlink_name(dns_adb_t *adb, dns_adbname_t *name) { INSIST(adb->name_refcnt[bucket] > 0); adb->name_refcnt[bucket]--; if (adb->name_sd[bucket] && adb->name_refcnt[bucket] == 0) - dec_adb_irefcnt(adb); + result = ISC_TRUE; + return (result); } /* @@ -804,9 +818,10 @@ link_entry(dns_adb_t *adb, int bucket, dns_adbentry_t *entry) { /* * Requires the entry's bucket be locked. */ -static inline void +static inline isc_boolean_t unlink_entry(dns_adb_t *adb, dns_adbentry_t *entry) { int bucket; + isc_boolean_t result = ISC_FALSE; bucket = entry->lock_bucket; INSIST(bucket != DNS_ADB_INVALIDBUCKET); @@ -816,7 +831,8 @@ unlink_entry(dns_adb_t *adb, dns_adbentry_t *entry) { INSIST(adb->entry_refcnt[bucket] > 0); adb->entry_refcnt[bucket]--; if (adb->entry_sd[bucket] && adb->entry_refcnt[bucket] == 0) - dec_adb_irefcnt(adb); + result = ISC_TRUE; + return (result); } static inline void @@ -832,9 +848,10 @@ violate_locking_hierarchy(isc_mutex_t *have, isc_mutex_t *want) { * The ADB _MUST_ be locked before calling. Also, exit conditions must be * checked after calling this function. */ -static void +static isc_boolean_t shutdown_names(dns_adb_t *adb) { int bucket; + isc_boolean_t result = ISC_FALSE; dns_adbname_t *name; dns_adbname_t *next_name; @@ -849,7 +866,8 @@ shutdown_names(dns_adb_t *adb) { * irefcnt ourselves, since it will not be * automatically triggered by a name being unlinked. */ - dec_adb_irefcnt(adb); + INSIST(result == ISC_FALSE); + result = dec_adb_irefcnt(adb); } else { /* * Run through the list. For each name, clean up finds @@ -859,22 +877,26 @@ shutdown_names(dns_adb_t *adb) { */ while (name != NULL) { next_name = ISC_LIST_NEXT(name, plink); - kill_name(&name, DNS_EVENT_ADBSHUTDOWN); + INSIST(result == ISC_FALSE); + result = kill_name(&name, + DNS_EVENT_ADBSHUTDOWN); name = next_name; } } UNLOCK(&adb->namelocks[bucket]); } + return (result); } /* * The ADB _MUST_ be locked before calling. Also, exit conditions must be * checked after calling this function. */ -static void +static isc_boolean_t shutdown_entries(dns_adb_t *adb) { int bucket; + isc_boolean_t result = ISC_FALSE; dns_adbentry_t *entry; dns_adbentry_t *next_entry; @@ -889,7 +911,7 @@ shutdown_entries(dns_adb_t *adb) { * irefcnt ourselves, since it will not be * automatically triggered by an entry being unlinked. */ - dec_adb_irefcnt(adb); + result = dec_adb_irefcnt(adb); } else { /* * Run through the list. Cleanup any entries not @@ -899,8 +921,10 @@ shutdown_entries(dns_adb_t *adb) { next_entry = ISC_LIST_NEXT(entry, plink); if (entry->refcnt == 0 && entry->expires != 0) { - unlink_entry(adb, entry); + result = unlink_entry(adb, entry); free_adbentry(adb, &entry); + if (result) + result = dec_adb_irefcnt(adb); } entry = next_entry; } @@ -908,6 +932,7 @@ shutdown_entries(dns_adb_t *adb) { UNLOCK(&adb->entrylocks[bucket]); } + return (result); } /* @@ -935,11 +960,12 @@ cancel_fetches_at_name(dns_adbname_t *name) { /* * Assumes the name bucket is locked. */ -static void +static isc_boolean_t clean_namehooks(dns_adb_t *adb, dns_adbnamehooklist_t *namehooks) { dns_adbentry_t *entry; dns_adbnamehook_t *namehook; int addr_bucket; + isc_boolean_t result = ISC_FALSE; addr_bucket = DNS_ADB_INVALIDBUCKET; namehook = ISC_LIST_HEAD(*namehooks); @@ -960,7 +986,7 @@ clean_namehooks(dns_adb_t *adb, dns_adbnamehooklist_t *namehooks) { LOCK(&adb->entrylocks[addr_bucket]); } - dec_entry_refcnt(adb, entry, ISC_FALSE); + result = dec_entry_refcnt(adb, entry, ISC_FALSE); } /* @@ -975,6 +1001,7 @@ clean_namehooks(dns_adb_t *adb, dns_adbnamehooklist_t *namehooks) { if (addr_bucket != DNS_ADB_INVALIDBUCKET) UNLOCK(&adb->entrylocks[addr_bucket]); + return (result); } static void @@ -1163,23 +1190,33 @@ clean_finds_at_name(dns_adbname_t *name, isc_eventtype_t evtype, static inline void check_exit(dns_adb_t *adb) { isc_event_t *event; - isc_task_t *etask; - isc_boolean_t zeroirefcnt, zeroerefcnt; - /* * The caller must be holding the adb lock. */ + if (adb->shutting_down) { + /* + * If there aren't any external references either, we're + * done. Send the control event to initiate shutdown. + */ + INSIST(!adb->cevent_sent); /* Sanity check. */ + event = &adb->cevent; + isc_task_send(adb->task, &event); + adb->cevent_sent = ISC_TRUE; + } +} + +static inline isc_boolean_t +dec_adb_irefcnt(dns_adb_t *adb) { + isc_event_t *event; + isc_task_t *etask; + isc_boolean_t result = ISC_FALSE; LOCK(&adb->reflock); - zeroirefcnt = ISC_TF(adb->irefcnt == 0); - zeroerefcnt = ISC_TF(adb->erefcnt == 0); - UNLOCK(&adb->reflock); - if (adb->shutting_down && zeroirefcnt && - isc_mempool_getallocated(adb->ahmp) == 0) { - /* - * We're now shutdown. Send any whenshutdown events. - */ + INSIST(adb->irefcnt > 0); + adb->irefcnt--; + + if (adb->irefcnt == 0) { event = ISC_LIST_HEAD(adb->whenshutdown); while (event != NULL) { ISC_LIST_UNLINK(adb->whenshutdown, event, ev_link); @@ -1188,27 +1225,18 @@ check_exit(dns_adb_t *adb) { isc_task_sendanddetach(&etask, &event); event = ISC_LIST_HEAD(adb->whenshutdown); } - - /* - * If there aren't any external references either, we're - * done. Send the control event to initiate shutdown. - */ - if (zeroerefcnt) { - INSIST(!adb->cevent_sent); /* Sanity check. */ - event = &adb->cevent; - isc_task_send(adb->task, &event); - adb->cevent_sent = ISC_TRUE; - } } + + if (adb->irefcnt == 0 && adb->erefcnt == 0) + result = ISC_TRUE; + UNLOCK(&adb->reflock); + return (result); } static inline void -dec_adb_irefcnt(dns_adb_t *adb) { +inc_adb_irefcnt(dns_adb_t *adb) { LOCK(&adb->reflock); - - INSIST(adb->irefcnt > 0); - adb->irefcnt--; - + adb->irefcnt++; UNLOCK(&adb->reflock); } @@ -1234,10 +1262,11 @@ inc_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, isc_boolean_t lock) { UNLOCK(&adb->entrylocks[bucket]); } -static inline void +static inline isc_boolean_t dec_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, isc_boolean_t lock) { int bucket; isc_boolean_t destroy_entry; + isc_boolean_t result = ISC_FALSE; bucket = entry->lock_bucket; @@ -1251,18 +1280,22 @@ dec_entry_refcnt(dns_adb_t *adb, dns_adbentry_t *entry, isc_boolean_t lock) { if (entry->refcnt == 0 && (adb->entry_sd[bucket] || entry->expires == 0)) { destroy_entry = ISC_TRUE; - unlink_entry(adb, entry); + result = unlink_entry(adb, entry); } if (lock) UNLOCK(&adb->entrylocks[bucket]); if (!destroy_entry) - return; + return (result); entry->lock_bucket = DNS_ADB_INVALIDBUCKET; free_adbentry(adb, &entry); + if (result) + result =dec_adb_irefcnt(adb); + + return (result); } static inline dns_adbname_t * @@ -1477,6 +1510,7 @@ new_adbfind(dns_adb_t *adb) { ISC_EVENT_INIT(&h->event, sizeof (isc_event_t), 0, 0, 0, NULL, NULL, NULL, NULL, h); + inc_adb_irefcnt(adb); h->magic = DNS_ADBFIND_MAGIC; return (h); } @@ -1666,7 +1700,7 @@ free_adbfetch6(dns_adb_t *adb, dns_adbfetch6_t **fetch) { isc_mempool_put(adb->af6mp, f); } -static inline void +static inline isc_boolean_t free_adbfind(dns_adb_t *adb, dns_adbfind_t **findp) { dns_adbfind_t *find; @@ -1684,6 +1718,7 @@ free_adbfind(dns_adb_t *adb, dns_adbfind_t **findp) { DESTROYLOCK(&find->lock); isc_mempool_put(adb->ahmp, find); + return (dec_adb_irefcnt(adb)); } /* @@ -1939,94 +1974,105 @@ shutdown_task(isc_task_t *task, isc_event_t *ev) { /* * name bucket must be locked; adb may be locked; no other locks held. */ -static void +static isc_boolean_t check_expire_name(dns_adbname_t **namep, isc_stdtime_t now) { dns_adbname_t *name; + isc_result_t result = ISC_FALSE; INSIST(namep != NULL && DNS_ADBNAME_VALID(*namep)); name = *namep; if (NAME_HAS_V4(name) || NAME_HAS_V6(name)) - return; + return (result); if (NAME_FETCH(name)) - return; + return (result); if (!EXPIRE_OK(name->expire_v4, now)) - return; + return (result); if (!EXPIRE_OK(name->expire_v6, now)) - return; + return (result); if (!EXPIRE_OK(name->expire_target, now)) - return; + return (result); /* * The name is empty. Delete it. */ - kill_name(&name, DNS_EVENT_ADBEXPIRED); + result = kill_name(&name, DNS_EVENT_ADBEXPIRED); *namep = NULL; /* * Our caller, or one of its callers, will be calling check_exit() at * some point, so we don't need to do it here. */ + return (result); } /* * entry bucket must be locked; adb may be locked; no other locks held. */ -static void +static isc_boolean_t check_expire_entry(dns_adb_t *adb, dns_adbentry_t **entryp, isc_stdtime_t now) { dns_adbentry_t *entry; + isc_boolean_t result = ISC_FALSE; INSIST(entryp != NULL && DNS_ADBENTRY_VALID(*entryp)); entry = *entryp; if (entry->refcnt != 0) - return; + return (result); if (entry->expires == 0 || entry->expires > now) - return; + return (result); /* * The entry is not in use. Delete it. */ DP(DEF_LEVEL, "killing entry %p", entry); INSIST(ISC_LINK_LINKED(entry, plink)); - unlink_entry(adb, entry); + result = unlink_entry(adb, entry); free_adbentry(adb, &entry); + if (result) + dec_adb_irefcnt(adb); *entryp = NULL; + return (result); } /* * ADB must be locked, and no other locks held. */ -static void +static isc_boolean_t cleanup_names(dns_adb_t *adb, int bucket, isc_stdtime_t now) { dns_adbname_t *name; dns_adbname_t *next_name; + isc_result_t result = ISC_FALSE; DP(CLEAN_LEVEL, "cleaning name bucket %d", bucket); LOCK(&adb->namelocks[bucket]); if (adb->name_sd[bucket]) { UNLOCK(&adb->namelocks[bucket]); - return; + return (result); } name = ISC_LIST_HEAD(adb->names[bucket]); while (name != NULL) { next_name = ISC_LIST_NEXT(name, plink); - check_expire_namehooks(name, now); - check_expire_name(&name, now); + INSIST(result == ISC_FALSE); + result = check_expire_namehooks(name, now); + if (!result) + result = check_expire_name(&name, now); name = next_name; } UNLOCK(&adb->namelocks[bucket]); + return (result); } /* * ADB must be locked, and no other locks held. */ -static void +static isc_boolean_t cleanup_entries(dns_adb_t *adb, int bucket, isc_stdtime_t now) { dns_adbentry_t *entry, *next_entry; + isc_boolean_t result = ISC_FALSE; DP(CLEAN_LEVEL, "cleaning entry bucket %d", bucket); @@ -2034,10 +2080,12 @@ cleanup_entries(dns_adb_t *adb, int bucket, isc_stdtime_t now) { entry = ISC_LIST_HEAD(adb->entries[bucket]); while (entry != NULL) { next_entry = ISC_LIST_NEXT(entry, plink); - check_expire_entry(adb, &entry, now); + INSIST(result == ISC_FALSE); + result = check_expire_entry(adb, &entry, now); entry = next_entry; } UNLOCK(&adb->entrylocks[bucket]); + return (result); } static void @@ -2059,8 +2107,10 @@ timer_cleanup(isc_task_t *task, isc_event_t *ev) { /* * Call our cleanup routines. */ - cleanup_names(adb, adb->next_cleanbucket, now); - cleanup_entries(adb, adb->next_cleanbucket, now); + INSIST(cleanup_names(adb, adb->next_cleanbucket, now) == + ISC_FALSE); + INSIST(cleanup_entries(adb, adb->next_cleanbucket, now) == + ISC_FALSE); /* * Set the next bucket to be cleaned. @@ -2310,7 +2360,7 @@ dns_adb_attach(dns_adb_t *adb, dns_adb_t **adbx) { void dns_adb_detach(dns_adb_t **adbx) { dns_adb_t *adb; - isc_boolean_t zeroerefcnt; + isc_boolean_t need_exit_check; REQUIRE(adbx != NULL && DNS_ADB_VALID(*adbx)); @@ -2321,13 +2371,13 @@ dns_adb_detach(dns_adb_t **adbx) { LOCK(&adb->reflock); adb->erefcnt--; - zeroerefcnt = ISC_TF(adb->erefcnt == 0); + need_exit_check = ISC_TF(adb->erefcnt == 0 && adb->irefcnt == 0); UNLOCK(&adb->reflock); - if (zeroerefcnt) { + if (need_exit_check) { LOCK(&adb->lock); - check_exit(adb); INSIST(adb->shutting_down); + check_exit(adb); UNLOCK(&adb->lock); } } @@ -2352,7 +2402,6 @@ dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) { LOCK(&adb->reflock); zeroirefcnt = ISC_TF(adb->irefcnt == 0); - UNLOCK(&adb->reflock); if (adb->shutting_down && zeroirefcnt && isc_mempool_getallocated(adb->ahmp) == 0) { @@ -2368,11 +2417,13 @@ dns_adb_whenshutdown(dns_adb_t *adb, isc_task_t *task, isc_event_t **eventp) { ISC_LIST_APPEND(adb->whenshutdown, event, ev_link); } + UNLOCK(&adb->reflock); UNLOCK(&adb->lock); } void dns_adb_shutdown(dns_adb_t *adb) { + isc_boolean_t need_check_exit; /* * Shutdown 'adb'. @@ -2382,9 +2433,11 @@ dns_adb_shutdown(dns_adb_t *adb) { if (!adb->shutting_down) { adb->shutting_down = ISC_TRUE; - shutdown_names(adb); - shutdown_entries(adb); - check_exit(adb); + need_check_exit = shutdown_names(adb); + if (!need_check_exit) + need_check_exit = shutdown_entries(adb); + if (need_check_exit) + check_exit(adb); } UNLOCK(&adb->lock); @@ -2471,7 +2524,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, if (adb->name_sd[bucket]) { DP(DEF_LEVEL, "dns_adb_createfind: returning ISC_R_SHUTTINGDOWN"); - free_adbfind(adb, &find); + INSIST(free_adbfind(adb, &find) == ISC_FALSE); result = ISC_R_SHUTTINGDOWN; goto out; } @@ -2482,7 +2535,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, if (adbname == NULL) { adbname = new_adbname(adb, name); if (adbname == NULL) { - free_adbfind(adb, &find); + INSIST(free_adbfind(adb, &find) == ISC_FALSE); result = ISC_R_NOMEMORY; goto out; } @@ -2498,7 +2551,7 @@ dns_adb_createfind(dns_adb_t *adb, isc_task_t *task, isc_taskaction_t action, /* * Expire old entries, etc. */ - check_expire_namehooks(adbname, now); + INSIST(check_expire_namehooks(adbname, now) == ISC_FALSE); /* * Do we know that the name is an alias? @@ -2781,7 +2834,7 @@ dns_adb_destroyfind(dns_adbfind_t **findp) { entry = ai->entry; ai->entry = NULL; INSIST(DNS_ADBENTRY_VALID(entry)); - dec_entry_refcnt(adb, entry, ISC_TRUE); + INSIST(dec_entry_refcnt(adb, entry, ISC_TRUE) == ISC_FALSE); free_adbaddrinfo(adb, &ai); ai = ISC_LIST_HEAD(find->list); } @@ -2794,8 +2847,8 @@ dns_adb_destroyfind(dns_adbfind_t **findp) { * lock is destroyed. */ LOCK(&adb->lock); - free_adbfind(adb, &find); - check_exit(adb); + if (free_adbfind(adb, &find)) + check_exit(adb); UNLOCK(&adb->lock); } @@ -3381,14 +3434,7 @@ fetch_callback(isc_task_t *task, isc_event_t *ev) { free_adbfetch(adb, &fetch); isc_event_free(&ev); - kill_name(&name, DNS_EVENT_ADBCANCELED); - - /* - * If we're shutting down and this bucket is empty, we need - * to call check_exit() to see if we're done. - */ - if (adb->name_sd[bucket] && adb->name_refcnt[bucket] == 0) - want_check_exit = ISC_TRUE; + want_check_exit = kill_name(&name, DNS_EVENT_ADBCANCELED); UNLOCK(&adb->namelocks[bucket]); @@ -3545,14 +3591,7 @@ fetch_callback_a6(isc_task_t *task, isc_event_t *ev) { free_adbfetch6(adb, &fetch); isc_event_free(&ev); - kill_name(&name, DNS_EVENT_ADBCANCELED); - - /* - * If we're shutting down and this bucket is empty, we need - * to call check_exit() to see if we're done. - */ - if (adb->name_sd[bucket] && adb->name_refcnt[bucket] == 0) - want_check_exit = ISC_TRUE; + want_check_exit = kill_name(&name, DNS_EVENT_ADBCANCELED); UNLOCK(&adb->namelocks[bucket]); @@ -4007,9 +4046,7 @@ dns_adb_freeaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **addrp) { entry->expires = now + 1800; /* XXXRTH */ - dec_entry_refcnt(adb, entry, ISC_FALSE); - if (adb->entry_sd[bucket] && adb->entry_refcnt[bucket] == 0) - want_check_exit = ISC_TRUE; + want_check_exit = dec_entry_refcnt(adb, entry, ISC_FALSE); UNLOCK(&adb->entrylocks[bucket]); @@ -4035,8 +4072,8 @@ dns_adb_flush(dns_adb_t *adb) { /* * Call our cleanup routines. */ - cleanup_names(adb, i, INT_MAX); - cleanup_entries(adb, i, INT_MAX); + INSIST(cleanup_names(adb, i, INT_MAX) == ISC_FALSE); + INSIST(cleanup_entries(adb, i, INT_MAX) == ISC_FALSE); } #ifdef DUMP_ADB_AFTER_CLEANING diff --git a/lib/dns/api b/lib/dns/api index 7ce3e0d4..c5d85110 100644 --- a/lib/dns/api +++ b/lib/dns/api @@ -1,3 +1,3 @@ LIBINTERFACE = 8 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h index 89615afc..03407a72 100644 --- a/lib/dns/include/dns/dispatch.h +++ b/lib/dns/include/dns/dispatch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001 Internet Software Consortium. + * Copyright (C) 1999-2001, 2003 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: dispatch.h,v 1.45 2001/04/30 18:09:28 gson Exp $ */ +/* $Id: dispatch.h,v 1.45.22.2 2003/02/17 07:05:10 marka Exp $ */ #ifndef DNS_DISPATCH_H #define DNS_DISPATCH_H 1 @@ -391,6 +391,11 @@ dns_dispatch_changeattributes(dns_dispatch_t *disp, * * new = (old & ~mask) | (attributes & mask) * + * This function has a side effect when DNS_DISPATCHATTR_NOLISTEN changes. + * When the flag becomes off, the dispatch will start receiving on the + * corresponding socket. When the flag becomes on, receive events on the + * corresponding socket will be canceled. + * * Requires: * disp is valid. * diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h index ca85eb3f..a6c5c343 100644 --- a/lib/dns/include/dns/zone.h +++ b/lib/dns/include/dns/zone.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 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: zone.h,v 1.106.2.5 2002/07/11 05:44:08 marka Exp $ */ +/* $Id: zone.h,v 1.106.2.5.4.2 2003/02/17 07:05:10 marka Exp $ */ #ifndef DNS_ZONE_H #define DNS_ZONE_H 1 @@ -215,7 +215,7 @@ isc_result_t dns_zone_loadnew(dns_zone_t *zone); /* * Cause the database to be loaded from its backing store. - * Confirm that the mimimum requirements for the zone type are + * Confirm that the minimum requirements for the zone type are * met, otherwise DNS_R_BADZONE is returned. * * dns_zone_loadnew() only loads zones that are not yet loaded. diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index ec77908e..e008b9d5 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 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: resolver.c,v 1.218.2.12 2002/07/15 02:28:07 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.12.4.4 2003/02/18 03:32:01 marka Exp $ */ #include <config.h> @@ -646,7 +646,11 @@ fctx_addopt(dns_message_t *message) { /* * Set EXTENDED-RCODE, VERSION, and Z to 0, and the DO bit to 1. */ +#ifdef ISC_RFC2535 rdatalist->ttl = DNS_MESSAGEEXTFLAG_DO; +#else + rdatalist->ttl = 0; +#endif /* * No EDNS options. @@ -3501,16 +3505,28 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) { * * Only one set of NS RRs is allowed. */ - if (ns_name != NULL && name != ns_name) - return (DNS_R_FORMERR); - ns_name = name; + if (rdataset->type == + dns_rdatatype_ns) { + if (ns_name != NULL && + name != ns_name) + return (DNS_R_FORMERR); + ns_name = name; + } name->attributes |= DNS_NAMEATTR_CACHE; rdataset->attributes |= DNS_RDATASETATTR_CACHE; rdataset->trust = dns_trust_glue; ns_rdataset = rdataset; - } else if (type == dns_rdatatype_soa || + } + } + for (rdataset = ISC_LIST_HEAD(name->list); + rdataset != NULL; + rdataset = ISC_LIST_NEXT(rdataset, link)) { + type = rdataset->type; + if (type == dns_rdatatype_sig) + type = rdataset->covers; + if (type == dns_rdatatype_soa || type == dns_rdatatype_nxt) { /* * SOA, SIG SOA, NXT, or SIG NXT. @@ -3524,11 +3540,18 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname) { return (DNS_R_FORMERR); soa_name = name; } - negative_response = ISC_TRUE; - name->attributes |= - DNS_NAMEATTR_NCACHE; - rdataset->attributes |= - DNS_RDATASETATTR_NCACHE; + if (ns_name == NULL) { + negative_response = ISC_TRUE; + name->attributes |= + DNS_NAMEATTR_NCACHE; + rdataset->attributes |= + DNS_RDATASETATTR_NCACHE; + } else { + name->attributes |= + DNS_NAMEATTR_CACHE; + rdataset->attributes |= + DNS_RDATASETATTR_CACHE; + } if (aa) rdataset->trust = dns_trust_authauthority; @@ -3846,8 +3869,8 @@ answer_response(fetchctx_t *fctx) { for (rdataset = ISC_LIST_HEAD(name->list); rdataset != NULL; rdataset = ISC_LIST_NEXT(rdataset, link)) { + isc_boolean_t found_dname = ISC_FALSE; found = ISC_FALSE; - want_chaining = ISC_FALSE; aflag = 0; if (rdataset->type == dns_rdatatype_dname) { /* @@ -3874,6 +3897,8 @@ answer_response(fetchctx_t *fctx) { want_chaining = ISC_FALSE; } else if (result != ISC_R_SUCCESS) return (result); + else + found_dname = ISC_TRUE; } else if (rdataset->type == dns_rdatatype_sig && rdataset->covers == dns_rdatatype_dname) { @@ -3919,7 +3944,7 @@ answer_response(fetchctx_t *fctx) { /* * DNAME chaining. */ - if (want_chaining) { + if (found_dname) { /* * Copy the the dname into the * qname fixed name. diff --git a/lib/dns/sec/dst/openssl_link.c b/lib/dns/sec/dst/openssl_link.c index 5df661e9..adb784ba 100644 --- a/lib/dns/sec/dst/openssl_link.c +++ b/lib/dns/sec/dst/openssl_link.c @@ -19,7 +19,7 @@ /* * Principal Author: Brian Wellington - * $Id: openssl_link.c,v 1.46 2001/07/31 03:45:04 marka Exp $ + * $Id: openssl_link.c,v 1.46.8.1 2003/02/18 06:24:45 marka Exp $ */ #ifdef OPENSSL @@ -38,7 +38,11 @@ #include <openssl/rand.h> #include <openssl/crypto.h> -#ifdef CRYPTO_LOCK_ENGINE +#if defined(CRYPTO_LOCK_ENGINE) && (OPENSSL_VERSION_NUMBER < 0x00907000L) +#define USE_ENGINE 1 +#endif + +#ifdef USE_ENGINE #include <openssl/engine.h> #endif @@ -46,7 +50,7 @@ static RAND_METHOD *rm = NULL; static isc_mutex_t *locks = NULL; static int nlocks; -#ifdef CRYPTO_LOCK_ENGINE +#ifdef USE_ENGINE static ENGINE *e; #endif @@ -120,7 +124,7 @@ dst__openssl_init() { rm->add = entropy_add; rm->pseudorand = entropy_getpseudo; rm->status = NULL; -#ifdef CRYPTO_LOCK_ENGINE +#ifdef USE_ENGINE e = ENGINE_new(); if (e == NULL) { result = ISC_R_NOMEMORY; @@ -133,7 +137,7 @@ dst__openssl_init() { #endif return (ISC_R_SUCCESS); -#ifdef CRYPTO_LOCK_ENGINE +#ifdef USE_ENGINE cleanup_rm: dst__mem_free(rm); #endif @@ -146,6 +150,12 @@ dst__openssl_init() { void dst__openssl_destroy() { +#ifdef USE_ENGINE + if (e != NULL) { + ENGINE_free(e); + e = NULL; + } +#endif if (locks != NULL) { RUNTIME_CHECK(isc_mutexblock_destroy(locks, nlocks) == ISC_R_SUCCESS); diff --git a/lib/dns/zone.c b/lib/dns/zone.c index 130584b2..cfa85852 100644 --- a/lib/dns/zone.c +++ b/lib/dns/zone.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002 Internet Software Consortium. + * Copyright (C) 1999-2003 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: zone.c,v 1.333.2.13 2002/08/06 02:24:15 marka Exp $ */ +/* $Id: zone.c,v 1.333.2.13.4.2 2003/02/17 07:05:08 marka Exp $ */ #include <config.h> @@ -4781,7 +4781,7 @@ zone_xfrdone(dns_zone_t *zone, isc_result_t result) { } if (result == ISC_R_SUCCESS && xfrresult == ISC_R_SUCCESS) dns_zone_log(zone, ISC_LOG_INFO, - "transfered serial %u", zone->serial); + "transferred serial %u", zone->serial); break; diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c index 062a7c0c..92ddc781 100644 --- a/lib/isc/unix/ifiter_ioctl.c +++ b/lib/isc/unix/ifiter_ioctl.c @@ -15,12 +15,30 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: ifiter_ioctl.c,v 1.19.2.2 2001/12/12 00:16:47 marka Exp $ */ +/* $Id: ifiter_ioctl.c,v 1.19.2.2.4.1 2003/02/19 04:32:41 marka Exp $ */ /* * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl. * See netintro(4). */ +#ifdef __hpux +#undef SIOCGLIFCONF +#undef lifc_len +#undef lifc_buf +#undef lifc_req +#undef lifconf +#undef SIOCGLIFADDR +#undef SIOCGLIFFLAGS +#undef SIOCGLIFDSTADDR +#undef SIOCGLIFNETMASK +#undef lifr_addr +#undef lifr_name +#undef lifr_dstaddr +#undef lifr_flags +#undef ss_family +#undef lifreq +#endif + #ifndef SIOCGLIFCONF #define SIOCGLIFCONF SIOCGIFCONF #define lifc_len ifc_len diff --git a/lib/isc/unix/socket.c b/lib/isc/unix/socket.c index 67148a4b..8e19b993 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.207.2.14 2002/07/11 04:04:26 marka Exp $ */ +/* $Id: socket.c,v 1.207.2.14.4.2 2003/02/18 07:28:41 marka Exp $ */ #include <config.h> @@ -338,7 +338,7 @@ wakeup_socket(isc_socketmgr_t *manager, int fd, int msg) { * or writes. */ - INSIST(fd >= 0 && fd < FD_SETSIZE); + INSIST(fd >= 0 && fd < (int)FD_SETSIZE); if (manager->fdstate[fd] == CLOSE_PENDING) { manager->fdstate[fd] = CLOSED; @@ -1153,7 +1153,7 @@ destroy(isc_socket_t **sockp) { INSIST(ISC_LIST_EMPTY(sock->recv_list)); INSIST(ISC_LIST_EMPTY(sock->send_list)); INSIST(sock->connect_ev == NULL); - REQUIRE(sock->fd >= 0 && sock->fd < FD_SETSIZE); + REQUIRE(sock->fd >= 0 && sock->fd < (int)FD_SETSIZE); LOCK(&manager->lock); @@ -1316,7 +1316,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type, break; } - if (sock->fd >= FD_SETSIZE) { + if (sock->fd >= (int)FD_SETSIZE) { (void)close(sock->fd); isc_log_iwrite(isc_lctx, ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR, @@ -1795,7 +1795,7 @@ internal_accept(isc_task_t *me, isc_event_t *ev) { sock->pf); (void)close(fd); goto soft_error; - } else if (fd >= FD_SETSIZE) { + } else if (fd >= (int)FD_SETSIZE) { isc_log_iwrite(isc_lctx, ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_ERROR, isc_msgcat, ISC_MSGSET_SOCKET, @@ -2007,7 +2007,7 @@ process_fds(isc_socketmgr_t *manager, int maxfd, isc_socket_t *sock; isc_boolean_t unlock_sock; - REQUIRE(maxfd <= FD_SETSIZE); + REQUIRE(maxfd <= (int)FD_SETSIZE); /* * Process read/writes on other fds here. Avoid locking @@ -2366,7 +2366,7 @@ isc_socketmgr_destroy(isc_socketmgr_t **managerp) { (void)isc_condition_destroy(&manager->shutdown_ok); #endif /* ISC_PLATFORM_USETHREADS */ - for (i = 0 ; i < FD_SETSIZE ; i++) + for (i = 0 ; i < (int)FD_SETSIZE ; i++) if (manager->fdstate[i] == CLOSE_PENDING) close(i); diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c index 53540118..119c4646 100644 --- a/lib/isc/win32/net.c +++ b/lib/isc/win32/net.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001 Internet Software Consortium. + * Copyright (C) 1999-2001, 2003 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: net.c,v 1.3 2001/07/09 21:06:12 gson Exp $ */ +/* $Id: net.c,v 1.3.8.2 2003/02/17 07:05:10 marka Exp $ */ #include <config.h> @@ -39,17 +39,15 @@ static isc_result_t ipv6_result = ISC_R_NOTFOUND; static isc_result_t try_proto(int domain) { - int s; + SOCKET s; isc_result_t result = ISC_R_SUCCESS; s = socket(domain, SOCK_STREAM, 0); - if (s == -1) { + if (s == INVALID_SOCKET) { switch (WSAGetLastError()) { case WSAEAFNOSUPPORT: case WSAEPROTONOSUPPORT: -#ifdef EINVAL - case EINVAL: -#endif + case WSAEINVAL: return (ISC_R_NOTFOUND); default: UNEXPECTED_ERROR(__FILE__, __LINE__, diff --git a/lib/isccfg/api b/lib/isccfg/api index ae2943dd..dbaaf58c 100644 --- a/lib/isccfg/api +++ b/lib/isccfg/api @@ -1,3 +1,3 @@ LIBINTERFACE = 0 -LIBREVISION = 3 +LIBREVISION = 4 LIBAGE = 0 diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 2d0832da..dc879231 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2002 Internet Software Consortium. + * Copyright (C) 2000-2003 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: parser.c,v 1.70.2.14 2002/02/08 03:57:47 marka Exp $ */ +/* $Id: parser.c,v 1.70.2.14.4.2 2003/02/17 07:05:10 marka Exp $ */ #include <config.h> @@ -799,7 +799,12 @@ namedconf_or_view_clauses[] = { { "key", &cfg_type_key, CFG_CLAUSEFLAG_MULTI }, { "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI }, { "server", &cfg_type_server, CFG_CLAUSEFLAG_MULTI }, +#ifdef ISC_RFC2535 { "trusted-keys", &cfg_type_trustedkeys, CFG_CLAUSEFLAG_MULTI }, +#else + { "trusted-keys", &cfg_type_trustedkeys, + CFG_CLAUSEFLAG_MULTI|CFG_CLAUSEFLAG_OBSOLETE }, +#endif { NULL, NULL, 0 } }; diff --git a/lib/lwres/man/lwres.html b/lib/lwres/man/lwres.html index 7b9f88dc..27ebf97c 100644 --- a/lib/lwres/man/lwres.html +++ b/lib/lwres/man/lwres.html @@ -20,7 +20,7 @@ >lwres</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -441,4 +441,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_buffer.html b/lib/lwres/man/lwres_buffer.html index ae2ffd50..117dbc95 100644 --- a/lib/lwres/man/lwres_buffer.html +++ b/lib/lwres/man/lwres_buffer.html @@ -20,7 +20,7 @@ >lwres_buffer</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -210,13 +210,19 @@ functions in the ISC library.</P ><P >A buffer is a region of memory, together with a set of related subregions. -The <I +The <SPAN +CLASS="emphasis" +><I CLASS="EMPHASIS" >used region</I +></SPAN > and the -<I +<SPAN +CLASS="emphasis" +><I CLASS="EMPHASIS" >available</I +></SPAN > region are disjoint, and their union is the buffer's region. The used region extends from the beginning of the buffer region to the @@ -228,31 +234,46 @@ buffer commands. Initially, the used region is empty.</P ><P >The used region is further subdivided into two disjoint regions: the -<I +<SPAN +CLASS="emphasis" +><I CLASS="EMPHASIS" >consumed region</I -> and the <I +></SPAN +> and the <SPAN +CLASS="emphasis" +><I CLASS="EMPHASIS" >remaining region</I +></SPAN >. The union of these two regions is the used region. The consumed region extends from the beginning of the used region to -the byte before the <I +the byte before the <SPAN +CLASS="emphasis" +><I CLASS="EMPHASIS" >current</I +></SPAN > offset (if any). -The <I +The <SPAN +CLASS="emphasis" +><I CLASS="EMPHASIS" >remaining</I +></SPAN > region the current pointer to the end of the used region. The size of the consumed region can be changed using various buffer commands. Initially, the consumed region is empty.</P ><P ->The <I +>The <SPAN +CLASS="emphasis" +><I CLASS="EMPHASIS" >active region</I +></SPAN > is an (optional) subregion of the remaining region. It extends from the current offset to an offset in the @@ -605,4 +626,4 @@ CLASS="PARAMETER" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_config.html b/lib/lwres/man/lwres_config.html index 67fbcdd8..3c80c9e6 100644 --- a/lib/lwres/man/lwres_config.html +++ b/lib/lwres/man/lwres_config.html @@ -20,7 +20,7 @@ >lwres_config</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -292,4 +292,4 @@ CLASS="FILENAME" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_context.html b/lib/lwres/man/lwres_context.html index 377125c4..90a969fd 100644 --- a/lib/lwres/man/lwres_context.html +++ b/lib/lwres/man/lwres_context.html @@ -20,7 +20,7 @@ >lwres_context</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -516,4 +516,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_gabn.html b/lib/lwres/man/lwres_gabn.html index 5611cac6..f6aab797 100644 --- a/lib/lwres/man/lwres_gabn.html +++ b/lib/lwres/man/lwres_gabn.html @@ -20,7 +20,7 @@ >lwres_gabn</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -439,4 +439,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_gai_strerror.html b/lib/lwres/man/lwres_gai_strerror.html index 7f245ba4..4cab1e32 100644 --- a/lib/lwres/man/lwres_gai_strerror.html +++ b/lib/lwres/man/lwres_gai_strerror.html @@ -20,7 +20,7 @@ >lwres_gai_strerror</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -291,4 +291,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_getaddrinfo.html b/lib/lwres/man/lwres_getaddrinfo.html index d04ecc1a..34b83cf1 100644 --- a/lib/lwres/man/lwres_getaddrinfo.html +++ b/lib/lwres/man/lwres_getaddrinfo.html @@ -20,7 +20,7 @@ >lwres_getaddrinfo</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -719,4 +719,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_gethostent.html b/lib/lwres/man/lwres_gethostent.html index 28671b86..615e348e 100644 --- a/lib/lwres/man/lwres_gethostent.html +++ b/lib/lwres/man/lwres_gethostent.html @@ -20,7 +20,7 @@ >lwres_gethostent</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -824,4 +824,4 @@ consequently the above functions don't, either.</P ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_getipnode.3 b/lib/lwres/man/lwres_getipnode.3 index c25c1a5d..6cc2dd95 100644 --- a/lib/lwres/man/lwres_getipnode.3 +++ b/lib/lwres/man/lwres_getipnode.3 @@ -153,7 +153,7 @@ and \fBlwres_getipnodebyaddr()\fR set \fI*error_num\fR -to an approriate error code and the function returns a +to an appropriate error code and the function returns a \fBNULL\fR pointer. The error codes and their meanings are defined in diff --git a/lib/lwres/man/lwres_getipnode.docbook b/lib/lwres/man/lwres_getipnode.docbook index f7e6e82d..73a69698 100644 --- a/lib/lwres/man/lwres_getipnode.docbook +++ b/lib/lwres/man/lwres_getipnode.docbook @@ -1,6 +1,6 @@ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> <!-- - - Copyright (C) 2001 Internet Software Consortium. + - Copyright (C) 2001, 2003 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 @@ -16,7 +16,7 @@ - WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --> -<!-- $Id: lwres_getipnode.docbook,v 1.4 2001/06/18 22:06:55 gson Exp $ --> +<!-- $Id: lwres_getipnode.docbook,v 1.4.118.2 2003/02/17 07:05:11 marka Exp $ --> <refentry> @@ -231,7 +231,7 @@ and <function>lwres_getipnodebyaddr()</function> set <parameter>*error_num</parameter> -to an approriate error code and the function returns a +to an appropriate error code and the function returns a <type>NULL</type> pointer. The error codes and their meanings are defined in diff --git a/lib/lwres/man/lwres_getipnode.html b/lib/lwres/man/lwres_getipnode.html index d0a71e69..35aa761f 100644 --- a/lib/lwres/man/lwres_getipnode.html +++ b/lib/lwres/man/lwres_getipnode.html @@ -20,7 +20,7 @@ >lwres_getipnode</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -398,7 +398,7 @@ CLASS="PARAMETER" >*error_num</I ></TT > -to an approriate error code and the function returns a +to an appropriate error code and the function returns a <SPAN CLASS="TYPE" >NULL</SPAN @@ -526,4 +526,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_getnameinfo.html b/lib/lwres/man/lwres_getnameinfo.html index b98a9284..dda3cc3e 100644 --- a/lib/lwres/man/lwres_getnameinfo.html +++ b/lib/lwres/man/lwres_getnameinfo.html @@ -20,7 +20,7 @@ >lwres_getnameinfo</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -300,4 +300,4 @@ are.</P ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_getrrsetbyname.html b/lib/lwres/man/lwres_getrrsetbyname.html index 3e5ab615..40d40815 100644 --- a/lib/lwres/man/lwres_getrrsetbyname.html +++ b/lib/lwres/man/lwres_getrrsetbyname.html @@ -20,7 +20,7 @@ >lwres_getrrsetbyname</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -368,4 +368,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_gnba.html b/lib/lwres/man/lwres_gnba.html index 98cc04dd..b89bfb99 100644 --- a/lib/lwres/man/lwres_gnba.html +++ b/lib/lwres/man/lwres_gnba.html @@ -20,7 +20,7 @@ >lwres_gnba</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -405,4 +405,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_hstrerror.html b/lib/lwres/man/lwres_hstrerror.html index 128b7e4f..dd93852c 100644 --- a/lib/lwres/man/lwres_hstrerror.html +++ b/lib/lwres/man/lwres_hstrerror.html @@ -20,7 +20,7 @@ >lwres_hstrerror</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -239,4 +239,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_inetntop.html b/lib/lwres/man/lwres_inetntop.html index 09d4fea3..54c18229 100644 --- a/lib/lwres/man/lwres_inetntop.html +++ b/lib/lwres/man/lwres_inetntop.html @@ -20,7 +20,7 @@ >lwres_inetntop</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -183,4 +183,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_noop.html b/lib/lwres/man/lwres_noop.html index fdb5da10..c27dea41 100644 --- a/lib/lwres/man/lwres_noop.html +++ b/lib/lwres/man/lwres_noop.html @@ -20,7 +20,7 @@ >lwres_noop</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -406,4 +406,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_packet.html b/lib/lwres/man/lwres_packet.html index 5c5828f4..0e4ebe77 100644 --- a/lib/lwres/man/lwres_packet.html +++ b/lib/lwres/man/lwres_packet.html @@ -20,7 +20,7 @@ >lwres_packet</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -370,4 +370,4 @@ CLASS="ERRORCODE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/lib/lwres/man/lwres_resutil.html b/lib/lwres/man/lwres_resutil.html index ae3a2f64..cdb64d47 100644 --- a/lib/lwres/man/lwres_resutil.html +++ b/lib/lwres/man/lwres_resutil.html @@ -20,7 +20,7 @@ >lwres_resutil</TITLE ><META NAME="GENERATOR" -CONTENT="Modular DocBook HTML Stylesheet Version 1.61 +CONTENT="Modular DocBook HTML Stylesheet Version 1.73 "></HEAD ><BODY CLASS="REFENTRY" @@ -409,4 +409,4 @@ CLASS="REFENTRYTITLE" ></DIV ></BODY ></HTML ->
\ No newline at end of file +> diff --git a/make/rules.in b/make/rules.in index 59d36646..f947b162 100644 --- a/make/rules.in +++ b/make/rules.in @@ -1,4 +1,4 @@ -# Copyright (C) 1998-2002 Internet Software Consortium. +# Copyright (C) 1998-2003 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 @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: rules.in,v 1.40.2.3 2002/07/10 00:35:46 marka Exp $ +# $Id: rules.in,v 1.40.2.3.4.2 2003/02/17 07:05:11 marka Exp $ ### ### Common Makefile rules for BIND 9. @@ -201,6 +201,7 @@ SGMLSPL = sgmlspl # .docbook.html: ${OPENJADE} -c ${SGMLCATALOG} -t sgml -d ${HTMLSTYLE} $< + echo "" >> r1.htm cat ${top_srcdir}/docutil/HTML_COPYRIGHT r1.htm > $@ .docbook.1: @@ -1,4 +1,4 @@ -# $Id: version,v 1.26.2.15 2002/08/06 05:47:04 marka Exp $ +# $Id: version,v 1.26.2.15.4.1 2003/02/17 06:26:27 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=2 PATCHVER=2 -RELEASETYPE=rc -RELEASEVER=1 +RELEASETYPE= +RELEASEVER= diff --git a/win32utils/readme1st.txt b/win32utils/readme1st.txt index 73e55d70..b187fee8 100644 --- a/win32utils/readme1st.txt +++ b/win32utils/readme1st.txt @@ -1,19 +1,13 @@ -Copyright (C) 2001 Internet Software Consortium. +Copyright (C) 2001, 2003 Internet Software Consortium. See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. -$Id: readme1st.txt,v 1.7.2.1 2001/09/06 05:31:02 marka Exp $ +$Id: readme1st.txt,v 1.7.2.1.6.3 2003/02/17 07:05:12 marka Exp $ - Release of BIND 9.2.0 for Window NT/2000 + Release of BIND 9.2.2 for Window NT/2000 -Date: 10-Aug-2001. - - This is the first release of BIND 9.2.0 for Windows NT/2000. As such -it should be fully tested on a test system before installing on a -production system or anywhere that is considered critical for Internet -access. The release has not been thoroughly tested. While IPv6 -addresses should work, there is no support yet for a BIND server using -an IPv6 stack. Only IPv4 stacks are supported on the box running this -version of BIND. IPv6 stacks will be supported in a future release. +This is a maintenance release of BIND 9.2 for Window NT/2000. Only +IPv4 stacks are supported on the box running this version of BIND. +IPv6 stacks will be supported in a future release. Kit Installation Information @@ -74,6 +68,11 @@ started and stopped in the same way as any other service and automatically starts whenever the system is booted. Signals are not supported and are in fact ignored. +Note: Unlike most Windows applications, named does not, change its +working directory when started as a service. If you wish to use +relative files in named.conf you will need to specify a working +directory. + Documentation This kit includes Documentation in HTML format. The documentation is not @@ -95,7 +94,7 @@ IMPORTANT NOTE ON USING THE TOOLS: If you wish to use nsupdate on a win32 platform to do dynamic updates to a zone you MUST create a resolv.conf in the System32\Drivers\etc directory containing a list of nameserver addresses to use to find -the nameserver authorative for the zone. The format of this file is: +the nameserver authoritative for the zone. The format of this file is: nameserver 1.2.3.4 nameserver 5.6.7.8 @@ -109,6 +108,8 @@ BIND running on that system. This will be fixed in a future release. +Messages are logged to the Application log in the EventViewer. + Problems Please report all problems to bind9-bugs@isc.org and not to me. All |