Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/dist/bind Pull up revision 1.2 (requested by itojun):
details: https://anonhg.NetBSD.org/src/rev/821a383a1d87
branches: netbsd-1-5
changeset: 493175:821a383a1d87
user: he <he%NetBSD.org@localhost>
date: Mon Jul 01 17:13:08 2002 +0000
description:
Pull up revision 1.2 (requested by itojun):
Update BIND to version 8.3.3.
diffstat:
dist/bind/bin/addr/addr.c | 17 +-
dist/bind/bin/nslookup/skip.c | 27 +-
dist/bind/doc/bog/files.me | 4 +-
dist/bind/include/arpa/nameser_compat.h | 6 +-
dist/bind/include/isc/eventlib.h | 6 +-
dist/bind/include/isc/irpmarshall.h | 7 +-
dist/bind/include/isc/memcluster.h | 4 +-
dist/bind/include/port_ipv6.h | 2 +
dist/bind/include/prand_conf.h | 13 +-
dist/bind/lib/inet/inet_addr.c | 15 +-
dist/bind/lib/inet/inet_cidr_ntop.c | 168 +++++++++++++++++--
dist/bind/lib/inet/inet_net_pton.c | 274 ++++++++++++++++++++++++++-----
dist/bind/lib/inet/inet_network.c | 11 +-
dist/bind/lib/inet/inet_pton.c | 8 +-
dist/bind/lib/irs/dns_gr.c | 17 +-
dist/bind/lib/irs/dns_pr.c | 15 +-
dist/bind/lib/irs/dns_pw.c | 7 +-
dist/bind/lib/irs/gai_strerror.c | 119 +++++++++----
dist/bind/lib/irs/gen_ho.c | 52 +++++-
dist/bind/lib/irs/gen_ng.c | 11 +-
dist/bind/lib/irs/gen_p.h | 6 +-
dist/bind/lib/irs/getgrent.c | 16 +-
dist/bind/lib/irs/getgrent_r.c | 26 ++-
dist/bind/lib/irs/getnetent_r.c | 44 ++++-
dist/bind/lib/irs/getnetgrent.c | 8 +-
dist/bind/lib/irs/getnetgrent_r.c | 45 ++++-
dist/bind/lib/irs/getprotoent.c | 5 +-
dist/bind/lib/irs/getprotoent_r.c | 39 ++++-
dist/bind/lib/irs/getpwent_r.c | 42 +++-
dist/bind/lib/irs/getservent.c | 5 +-
dist/bind/lib/irs/getservent_r.c | 39 ++++-
dist/bind/lib/irs/irp_gr.c | 9 +-
dist/bind/lib/irs/irp_ho.c | 17 +-
dist/bind/lib/irs/irp_ng.c | 16 +-
dist/bind/lib/irs/irp_pw.c | 6 +-
dist/bind/lib/irs/lcl_gr.c | 8 +-
dist/bind/lib/irs/lcl_ho.c | 79 ++++++++-
dist/bind/lib/irs/lcl_ng.c | 18 +-
dist/bind/lib/irs/lcl_nw.c | 6 +-
dist/bind/lib/irs/lcl_pw.c | 6 +-
dist/bind/lib/irs/lcl_sv.c | 17 +-
dist/bind/lib/irs/nis_gr.c | 9 +-
dist/bind/lib/irs/nis_ho.c | 83 +++++++++-
dist/bind/lib/irs/nis_ng.c | 20 +-
dist/bind/lib/irs/nis_nw.c | 10 +-
dist/bind/lib/irs/nis_pr.c | 25 +-
dist/bind/lib/irs/nis_pw.c | 11 +-
dist/bind/lib/irs/nis_sv.c | 7 +-
dist/bind/lib/irs/nul_ng.c | 25 ++-
dist/bind/lib/isc/assertions.c | 15 +-
dist/bind/lib/isc/bitncmp.c | 8 +-
dist/bind/lib/isc/ctl_p.h | 6 +-
dist/bind/lib/isc/ev_streams.c | 14 +-
dist/bind/lib/isc/tree.c | 22 +-
dist/bind/lib/nameser/ns_date.c | 6 +-
dist/bind/lib/resolv/herror.c | 20 +-
dist/bind/lib/resolv/res_mkquery.c | 65 +++++++-
57 files changed, 1231 insertions(+), 355 deletions(-)
diffs (truncated from 3722 to 300 lines):
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/bin/addr/addr.c
--- a/dist/bind/bin/addr/addr.c Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/bin/addr/addr.c Mon Jul 01 17:13:08 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: addr.c,v 1.1.1.1 1999/11/20 18:53:58 veego Exp $ */
+/* $NetBSD: addr.c,v 1.1.1.1.8.1 2002/07/01 17:13:08 he Exp $ */
#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "Id: addr.c,v 8.8 1999/10/13 16:38:55 vixie Exp";
+static const char rcsid[] = "Id: addr.c,v 8.9 2002/05/21 02:26:21 marka Exp";
#endif /* not lint */
/*
@@ -49,11 +49,7 @@
/* Warning: this scribbles on `dst' even if it's going to return `0'. */
static int
-hexstring(src, dst, len)
- const char *src;
- u_char *dst;
- int len;
-{
+hexstring(const char *src, u_char *dst, int len) {
static const char xdigits[] = "0123456789abcdef";
u_char *ptr = dst, *end = dst + len;
u_int val;
@@ -102,12 +98,7 @@
}
static void
-display(input, af, addr, len)
- const char *input;
- int af;
- const u_char *addr;
- int len;
-{
+display(const char *input, int af, const u_char *addr, int len) {
static int before = 0;
char p[sizeof "xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255"];
int i;
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/bin/nslookup/skip.c
--- a/dist/bind/bin/nslookup/skip.c Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/bin/nslookup/skip.c Mon Jul 01 17:13:08 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: skip.c,v 1.1.1.1 1999/11/20 18:54:02 veego Exp $ */
+/* $NetBSD: skip.c,v 1.1.1.1.8.1 2002/07/01 17:13:08 he Exp $ */
/*
* Copyright (c) 1985, 1989
@@ -55,7 +55,7 @@
#ifndef lint
static const char sccsid[] = "@(#)skip.c 5.12 (Berkeley) 3/21/91";
-static const char rcsid[] = "Id: skip.c,v 8.5 1999/10/13 16:39:20 vixie Exp";
+static const char rcsid[] = "Id: skip.c,v 8.7 2001/06/20 12:30:35 marka Exp";
#endif /* not lint */
/*
@@ -86,8 +86,9 @@
#include <stdio.h>
#include "port_after.h"
+#include "res.h"
-char *res_skip_rr();
+static unsigned char *res_skip_rr(unsigned char *cp, unsigned char *eom);
/*
@@ -111,13 +112,13 @@
*******************************************************************************
*/
-char *
+unsigned char *
res_skip(msg, numFieldsToSkip, eom)
- char *msg;
+ unsigned char *msg;
int numFieldsToSkip;
- char *eom;
+ unsigned char *eom;
{
- register char *cp;
+ register unsigned char *cp;
register HEADER *hp;
register int tmp;
register int n;
@@ -134,7 +135,7 @@
n = ntohs(hp->qdcount);
if (n > 0) {
while (--n >= 0 && cp < eom) {
- tmp = dn_skipname((u_char *)cp, (u_char *)eom);
+ tmp = dn_skipname(cp, eom);
if (tmp == -1) return(NULL);
cp += tmp;
cp += INT16SZ; /* type */
@@ -195,15 +196,15 @@
*******************************************************************************
*/
-char *
+static unsigned char *
res_skip_rr(cp, eom)
- char *cp;
- char *eom;
+ unsigned char *cp;
+ unsigned char *eom;
{
int tmp;
int dlen;
- if ((tmp = dn_skipname((u_char *)cp, (u_char *)eom)) == -1)
+ if ((tmp = dn_skipname(cp, eom)) == -1)
return (NULL); /* compression error */
cp += tmp;
if ((cp + RRFIXEDSZ) > eom)
@@ -211,7 +212,7 @@
cp += INT16SZ; /* type */
cp += INT16SZ; /* class */
cp += INT32SZ; /* ttl */
- dlen = ns_get16((u_char*)cp);
+ dlen = ns_get16(cp);
cp += INT16SZ; /* dlen */
cp += dlen;
if (cp > eom)
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/doc/bog/files.me
--- a/dist/bind/doc/bog/files.me Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/doc/bog/files.me Mon Jul 01 17:13:08 2002 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: files.me,v 1.1.1.1 2000/04/28 03:39:17 itojun Exp $
+.\" $NetBSD: files.me,v 1.1.1.1.4.1 2002/07/01 17:13:09 he Exp $
.\"
.\" ++Copyright++ 1986, 1988, 1995
.\" -
@@ -704,7 +704,7 @@
.pp
The origin is a way of changing the origin in a data file. The line starts
in column 1, and is followed by a domain origin. This seems like it could
-be useful for putting more then one zone into a data file, but that's not
+be useful for putting more than one zone into a data file, but that's not
how it works. The name server fundamentally requires a given zone to map
entirely to some specific file. You should therefore be very careful to use
$ORIGIN only once at the top of a file, or, within a file, to change to a
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/include/arpa/nameser_compat.h
--- a/dist/bind/include/arpa/nameser_compat.h Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/include/arpa/nameser_compat.h Mon Jul 01 17:13:08 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nameser_compat.h,v 1.1.1.1 1999/11/20 18:54:04 veego Exp $ */
+/* $NetBSD: nameser_compat.h,v 1.1.1.1.8.1 2002/07/01 17:13:10 he Exp $ */
/* Copyright (c) 1983, 1989
* The Regents of the University of California. All rights reserved.
@@ -34,7 +34,7 @@
/*
* from nameser.h 8.1 (Berkeley) 6/2/93
- * Id: nameser_compat.h,v 8.11 1999/01/02 08:00:58 vixie Exp
+ * Id: nameser_compat.h,v 8.14 2002/05/18 01:39:11 marka Exp
*/
#ifndef _ARPA_NAMESER_COMPAT_
@@ -66,6 +66,7 @@
defined(apollo) || defined(__convex__) || defined(_CRAY) || \
defined(__hppa) || defined(__hp9000) || \
defined(__hp9000s300) || defined(__hp9000s700) || \
+ defined(__hp3000s900) || defined(__hpux) || defined(MPE) || \
defined (BIT_ZERO_ON_LEFT) || defined(m68k) || \
(defined(__Lynx__) && \
(defined(__68k__) || defined(__sparc__) || defined(__powerpc__)))
@@ -209,6 +210,7 @@
#define T_SRV ns_t_srv
#define T_ATMA ns_t_atma
#define T_NAPTR ns_t_naptr
+#define T_A6 ns_t_a6
#define T_TSIG ns_t_tsig
#define T_IXFR ns_t_ixfr
#define T_AXFR ns_t_axfr
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/include/isc/eventlib.h
--- a/dist/bind/include/isc/eventlib.h Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/include/isc/eventlib.h Mon Jul 01 17:13:08 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: eventlib.h,v 1.1.1.1 1999/11/20 18:54:03 veego Exp $ */
+/* $NetBSD: eventlib.h,v 1.1.1.1.8.1 2002/07/01 17:13:10 he Exp $ */
/*
* Copyright (c) 1995-1999 by Internet Software Consortium
@@ -20,7 +20,7 @@
/* eventlib.h - exported interfaces for eventlib
* vix 09sep95 [initial]
*
- * Id: eventlib.h,v 1.22 1999/08/18 22:09:04 vixie Exp
+ * Id: eventlib.h,v 1.23 2001/05/29 05:47:09 marka Exp
*/
#ifndef _EVENTLIB_H
@@ -108,7 +108,7 @@
int evListen __P((evContext ctx, int fd, int maxconn,
evConnFunc func, void *uap, evConnID *id));
-int evConnect __P((evContext ctx, int fd, void *ra, int ralen,
+int evConnect __P((evContext ctx, int fd, const void *ra, int ralen,
evConnFunc func, void *uap, evConnID *id));
int evCancelConn __P((evContext ctx, evConnID id));
int evHold __P((evContext, evConnID));
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/include/isc/irpmarshall.h
--- a/dist/bind/include/isc/irpmarshall.h Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/include/isc/irpmarshall.h Mon Jul 01 17:13:08 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irpmarshall.h,v 1.1.1.1 1999/11/20 18:54:03 veego Exp $ */
+/* $NetBSD: irpmarshall.h,v 1.1.1.1.8.1 2002/07/01 17:13:10 he Exp $ */
/*
* Copyright (c) 1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
*/
/*
- * Id: irpmarshall.h,v 8.1 1999/01/18 07:46:47 vixie Exp
+ * Id: irpmarshall.h,v 8.2 2001/05/29 05:47:10 marka Exp
*/
#ifndef _IRPMARSHALL_H_INCLUDED
@@ -59,7 +59,8 @@
int irp_unmarshall_ho(struct hostent *ho, char *buffer);
int irp_marshall_ng(const char *host, const char *user, const char *domain,
char **buffer, size_t *len);
-int irp_unmarshall_ng(char **host, char **user, char **domain, char *buffer);
+int irp_unmarshall_ng(const char **host, const char **user,
+ const char **domain, char *buffer);
int irp_marshall_nw(struct nwent *ne, char **buffer, size_t *len);
int irp_unmarshall_nw(struct nwent *ne, char *buffer);
int irp_marshall_ne(struct netent *ne, char **buffer, size_t *len);
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/include/isc/memcluster.h
--- a/dist/bind/include/isc/memcluster.h Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/include/isc/memcluster.h Mon Jul 01 17:13:08 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: memcluster.h,v 1.1.1.1 1999/11/20 18:54:03 veego Exp $ */
+/* $NetBSD: memcluster.h,v 1.1.1.1.8.1 2002/07/01 17:13:11 he Exp $ */
/*
* Copyright (c) 1997,1999 by Internet Software Consortium.
@@ -36,6 +36,7 @@
#endif /*MEMCLUSTER_RECORD*/
#endif /*MEMCLUSTER_DEBUG*/
#define memstats __memstats
+#define memactive __memactive
int meminit(size_t, size_t);
void * __memget(size_t);
@@ -45,5 +46,6 @@
void * __memget_record(size_t, const char *, int);
void __memput_record(void *, size_t, const char *, int);
void memstats(FILE *);
+int memactive(void);
#endif /* MEMCLUSTER_H */
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/include/port_ipv6.h
--- a/dist/bind/include/port_ipv6.h Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/include/port_ipv6.h Mon Jul 01 17:13:08 2002 +0000
@@ -5,5 +5,7 @@
#define port_ipv6_h
#define HAS_INET6_STRUCTS
+#define HAVE_SIN6_SCOPE_ID
+#define USE_IFNAMELINKID
#endif
diff -r 74d0bd1ac389 -r 821a383a1d87 dist/bind/include/prand_conf.h
--- a/dist/bind/include/prand_conf.h Mon Jul 01 17:12:57 2002 +0000
+++ b/dist/bind/include/prand_conf.h Mon Jul 01 17:13:08 2002 +0000
@@ -1,14 +1,15 @@
-/* $NetBSD: prand_conf.h,v 1.1.1.1 1999/11/20 18:54:03 veego Exp $ */
+/* $NetBSD: prand_conf.h,v 1.1.1.1.8.1 2002/07/01 17:13:12 he Exp $ */
#ifndef _PRAND_CMD_H_
#define _PRAND_CMD_H_
#ifndef HAVE_DEV_RANDOM
- # define HAVE_DEV_RANDOM 1
- #endif /* HAVE_DEV_RANDOM */
+# define HAVE_DEV_RANDOM 1
+#endif /* HAVE_DEV_RANDOM */
-const char *cmds[] = {
+
+static const char *cmds[] = {
"/bin/ps -axlw 2>&1",
"/usr/sbin/arp -an 2>&1",
"/usr/bin/netstat -an 2>&1",
@@ -22,7 +23,7 @@
NULL
};
-const char *dirs[] = {
+static const char *dirs[] = {
"/tmp",
"/var/tmp",
".",
@@ -35,7 +36,7 @@
Home |
Main Index |
Thread Index |
Old Index