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.3 (requested by itojun):
details: https://anonhg.NetBSD.org/src/rev/f7316703c655
branches: netbsd-1-5
changeset: 493180:f7316703c655
user: he <he%NetBSD.org@localhost>
date: Mon Jul 01 17:14:33 2002 +0000
description:
Pull up revision 1.3 (requested by itojun):
Update BIND to version 8.3.3.
diffstat:
dist/bind/bin/irpd/irs-irpd.conf | 3 +-
dist/bind/bin/mkservdb/mkservdb.c | 12 +-
dist/bind/bin/named-bootconf/named-bootconf.sh | 7 +-
dist/bind/bin/named/db_func.h | 12 +-
dist/bind/bin/named/db_lookup.c | 6 +-
dist/bind/bin/named/db_save.c | 10 +-
dist/bind/bin/named/db_sec.c | 92 +++----
dist/bind/bin/named/db_tsig.c | 8 +-
dist/bind/bin/named/ns_ncache.c | 22 +-
dist/bind/bin/named/ns_parseutil.c | 11 +-
dist/bind/bin/named/ns_parseutil.h | 7 +-
dist/bind/bin/named/ns_signal.c | 36 ++-
dist/bind/bin/nslookup/commands.l | 37 +-
dist/bind/bin/nslookup/list.c | 89 ++++++-
dist/bind/bin/nslookup/main.c | 287 +++++++++++++++++-------
dist/bind/bin/nslookup/res.h | 43 ++-
dist/bind/bin/nslookup/subr.c | 55 ++-
dist/bind/include/irs.h | 21 +-
dist/bind/include/isc/assertions.h | 10 +-
dist/bind/include/isc/ctl.h | 14 +-
dist/bind/include/isc/list.h | 16 +-
dist/bind/include/isc/misc.h | 12 +-
dist/bind/lib/dst/dst_internal.h | 25 +-
dist/bind/lib/dst/hmac_link.c | 12 +-
dist/bind/lib/inet/inet_cidr_pton.c | 169 ++++++++++++--
dist/bind/lib/inet/inet_net_ntop.c | 137 +++++++++++-
dist/bind/lib/irs/dns.c | 6 +-
dist/bind/lib/irs/dns_sv.c | 28 +-
dist/bind/lib/irs/gen.c | 9 +-
dist/bind/lib/irs/gen_gr.c | 35 ++-
dist/bind/lib/irs/gethostent_r.c | 45 +++-
dist/bind/lib/irs/getnetent.c | 9 +-
dist/bind/lib/irs/hesiod.c | 6 +-
dist/bind/lib/irs/irp_p.h | 7 +-
dist/bind/lib/irs/irpmarshall.c | 41 ++-
dist/bind/lib/irs/lcl.c | 6 +-
dist/bind/lib/irs/nis.c | 6 +-
dist/bind/lib/irs/util.c | 6 +-
dist/bind/lib/isc/ctl_p.c | 42 ++-
dist/bind/lib/isc/ev_connects.c | 29 +-
dist/bind/lib/isc/ev_files.c | 23 +-
dist/bind/lib/isc/logging.c | 28 +-
dist/bind/lib/nameser/ns_sign.c | 36 ++-
dist/bind/lib/nameser/ns_verify.c | 9 +-
dist/bind/lib/resolv/res_mkupdate.c | 12 +-
dist/bind/lib/resolv/res_query.c | 40 ++-
46 files changed, 1130 insertions(+), 446 deletions(-)
diffs (truncated from 3843 to 300 lines):
diff -r e554f6972943 -r f7316703c655 dist/bind/bin/irpd/irs-irpd.conf
--- a/dist/bind/bin/irpd/irs-irpd.conf Mon Jul 01 17:14:23 2002 +0000
+++ b/dist/bind/bin/irpd/irs-irpd.conf Mon Jul 01 17:14:33 2002 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: irs-irpd.conf,v 1.2 1999/11/20 19:03:48 veego Exp $
+# $NetBSD: irs-irpd.conf,v 1.2.8.1 2002/07/01 17:14:33 he Exp $
+#
# Private irs config file for irpd so that it doesn't get configured to
# talk to itself.
passwd local
diff -r e554f6972943 -r f7316703c655 dist/bind/bin/mkservdb/mkservdb.c
--- a/dist/bind/bin/mkservdb/mkservdb.c Mon Jul 01 17:14:23 2002 +0000
+++ b/dist/bind/bin/mkservdb/mkservdb.c Mon Jul 01 17:14:33 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: mkservdb.c,v 1.1.1.1.8.1 2001/01/28 15:52:17 he Exp $ */
+/* $NetBSD: mkservdb.c,v 1.1.1.1.8.2 2002/07/01 17:14:33 he Exp $ */
#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "Id: mkservdb.c,v 1.9 2001/01/26 06:54:11 vixie Exp";
+static const char rcsid[] = "Id: mkservdb.c,v 1.10 2001/06/18 14:42:46 marka Exp";
#endif /* not lint */
/*
@@ -71,9 +71,9 @@
DB *db;
DBT key;
DBT data;
- char *filename = _PATH_SERVICES;
- char *tmpdatabase = _PATH_SERVICES_DB_TMP;
- char *database = _PATH_SERVICES_DB;
+ const char *filename = _PATH_SERVICES;
+ const char *tmpdatabase = _PATH_SERVICES_DB_TMP;
+ const char *database = _PATH_SERVICES_DB;
char dbuf[1024];
char kbuf[512];
u_short *ports;
@@ -154,7 +154,7 @@
if (sv->s_aliases != NULL)
for (n = 0; sv->s_aliases[n] != NULL; n++)
if ((p + strlen(sv->s_aliases[n]) + 1) - dbuf
- <= sizeof dbuf) {
+ <= (int)sizeof dbuf) {
strcpy(p, sv->s_aliases[n]);
p += strlen(p) + 1;
}
diff -r e554f6972943 -r f7316703c655 dist/bind/bin/named-bootconf/named-bootconf.sh
--- a/dist/bind/bin/named-bootconf/named-bootconf.sh Mon Jul 01 17:14:23 2002 +0000
+++ b/dist/bind/bin/named-bootconf/named-bootconf.sh Mon Jul 01 17:14:33 2002 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: named-bootconf.sh,v 1.1.1.1.8.1 2001/01/28 15:52:17 he Exp $
+# $NetBSD: named-bootconf.sh,v 1.1.1.1.8.2 2002/07/01 17:14:34 he Exp $
#
# Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -143,6 +143,11 @@
no-recursion )
echo " recursion no;" >>$OPTIONFILE
;;
+ no-round-robin ) # HP extention
+ echo " rrset-order {" >>$OPTIONFILE
+ echo " class ANY type ANY name \"*\" order fixed;" >>$OPTIONFILE
+ echo " };" >>$OPTIONFILE
+ ;;
esac
done
rm -f $COMMENTFILE
diff -r e554f6972943 -r f7316703c655 dist/bind/bin/named/db_func.h
--- a/dist/bind/bin/named/db_func.h Mon Jul 01 17:14:23 2002 +0000
+++ b/dist/bind/bin/named/db_func.h Mon Jul 01 17:14:33 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_func.h,v 1.1.1.1.8.1 2001/01/28 15:52:17 he Exp $ */
+/* $NetBSD: db_func.h,v 1.1.1.1.8.2 2002/07/01 17:14:35 he Exp $ */
/*
* Copyright (c) 1985, 1990
@@ -92,7 +92,7 @@
/* db_proc.h - prototypes for functions in db_*.c
*
- * Id: db_func.h,v 8.44 2000/12/02 23:28:33 vixie Exp
+ * Id: db_func.h,v 8.46 2001/06/18 14:42:51 marka Exp
*/
/* ++from db_update.c++ */
@@ -115,7 +115,7 @@
/* --from db_save.c-- */
/* ++from db_dump.c++ */
-int db_dump(struct hashbuf *, FILE *, int, char *),
+int db_dump(struct hashbuf *, FILE *, int, const char *),
zt_dump(FILE *);
void doadump(void);
/* --from db_dump.c-- */
@@ -144,7 +144,7 @@
char *domain, u_int32_t ttl,
int type, enum context context,
enum transport transport,
- char **errmsg);
+ const char **errmsg);
/* --from db_load.c-- */
/* ++from db_glue.c++ */
@@ -167,7 +167,7 @@
struct namebuf **,
struct namebuf *);
void rm_hash(struct hashbuf *);
-void db_freedata(struct databuf *);
+void db_detach(struct databuf **);
void db_lame_add(char *zone, char *server, time_t when);
time_t db_lame_find(char *zone, struct databuf *dp);
void db_lame_clean(void);
@@ -205,7 +205,7 @@
/* --from db_sec.c-- */
/* ++from db_tsig.c++ */
-char * tsig_alg_name(int value);
+const char * tsig_alg_name(int value);
int tsig_alg_value(char *name);
struct dst_key * tsig_key_from_addr(struct in_addr addr);
struct tsig_record * new_tsig(struct dst_key *key, u_char *sig, int siglen);
diff -r e554f6972943 -r f7316703c655 dist/bind/bin/named/db_lookup.c
--- a/dist/bind/bin/named/db_lookup.c Mon Jul 01 17:14:23 2002 +0000
+++ b/dist/bind/bin/named/db_lookup.c Mon Jul 01 17:14:33 2002 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: db_lookup.c,v 1.1.1.1.8.1 2001/01/28 15:52:18 he Exp $ */
+/* $NetBSD: db_lookup.c,v 1.1.1.1.8.2 2002/07/01 17:14:35 he Exp $ */
#if !defined(lint) && !defined(SABER)
static const char sccsid[] = "@(#)db_lookup.c 4.18 (Berkeley) 3/21/91";
-static const char rcsid[] = "Id: db_lookup.c,v 8.26 2000/04/21 06:54:03 vixie Exp";
+static const char rcsid[] = "Id: db_lookup.c,v 8.27 2001/06/18 14:42:55 marka Exp";
#endif /* not lint */
/*
@@ -260,7 +260,7 @@
return (0);
if (dp->d_type != type && dp->d_type != T_SIG && type != T_ANY)
return (0);
- if (type != T_SIG && dp->d_type == T_SIG && SIG_COVERS(dp) != type)
+ if (type != T_SIG && dp->d_type == T_SIG && (int)SIG_COVERS(dp) != type)
return (0);
return (1);
}
diff -r e554f6972943 -r f7316703c655 dist/bind/bin/named/db_save.c
--- a/dist/bind/bin/named/db_save.c Mon Jul 01 17:14:23 2002 +0000
+++ b/dist/bind/bin/named/db_save.c Mon Jul 01 17:14:33 2002 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: db_save.c,v 1.1.1.1.8.1 2001/01/28 15:52:18 he Exp $ */
+/* $NetBSD: db_save.c,v 1.1.1.1.8.2 2002/07/01 17:14:36 he Exp $ */
#if !defined(lint) && !defined(SABER)
static const char sccsid[] = "@(#)db_save.c 4.16 (Berkeley) 3/21/91";
-static const char rcsid[] = "Id: db_save.c,v 8.28 2000/11/29 06:55:48 marka Exp";
+static const char rcsid[] = "Id: db_save.c,v 8.30 2002/05/18 01:02:56 marka Exp";
#endif /* not lint */
/*
@@ -139,7 +139,7 @@
int size;
{
struct databuf *dp;
- int bytes = DATASIZE(size);
+ int bytes = BIND_DATASIZE(size);
dp = (struct databuf *)memget(bytes);
if (dp == NULL)
@@ -160,6 +160,10 @@
dp->d_rcode = NOERROR;
dp->d_addr.s_addr = htonl(0);
dp->d_nstime = 0;
+ dp->d_rcnt = 1;
+#ifdef CHECK_MAGIC
+ dp->d_magic = DATABUF_MAGIC;
+#endif
memcpy(dp->d_data, data, dp->d_size);
return (dp);
}
diff -r e554f6972943 -r f7316703c655 dist/bind/bin/named/db_sec.c
--- a/dist/bind/bin/named/db_sec.c Mon Jul 01 17:14:23 2002 +0000
+++ b/dist/bind/bin/named/db_sec.c Mon Jul 01 17:14:33 2002 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: db_sec.c,v 1.1.1.1.8.1 2001/01/28 15:52:18 he Exp $ */
+/* $NetBSD: db_sec.c,v 1.1.1.1.8.2 2002/07/01 17:14:36 he Exp $ */
#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "Id: db_sec.c,v 8.32 2000/12/23 08:14:36 vixie Exp";
+static const char rcsid[] = "Id: db_sec.c,v 8.35 2001/06/18 14:42:57 marka Exp";
#endif /* not lint */
/*
@@ -141,7 +141,7 @@
tree_srch_pubkey (const char *name) {
struct zpubkey tkey, *key;
- tkey.zpk_name = (char *) name;
+ DE_CONST(name, tkey.zpk_name);
if (trusted_keys == NULL) {
tree_init(&trusted_keys);
return (NULL);
@@ -272,7 +272,7 @@
case ns_t_soa:
case ns_t_minfo:
case ns_t_rp:
- if (eob - bp < strlen((char *)cp) + 1)
+ if (eob - bp < (int)strlen((char *)cp) + 1)
return (-1);
if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
return (-1);
@@ -282,7 +282,7 @@
bp += len;
cp += strlen((char *)cp) + 1;
- if (eob - bp < strlen((char *)cp) + 1)
+ if (eob - bp < (int)strlen((char *)cp) + 1)
return (-1);
if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
return (-1);
@@ -309,7 +309,7 @@
case ns_t_mr:
case ns_t_ptr:
case ns_t_nxt:
- if (eob - bp < strlen((char *)cp) + 1)
+ if (eob - bp < (int)strlen((char *)cp) + 1)
return (-1);
if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
return (-1);
@@ -345,7 +345,7 @@
bp += INT16SZ;
cp += INT16SZ;
- if (eob - bp < strlen((char *)cp) + 1)
+ if (eob - bp < (int)strlen((char *)cp) + 1)
return (-1);
if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
return (-1);
@@ -356,7 +356,7 @@
cp += strlen((char *)cp) + 1;
if (dp->d_type == ns_t_px) {
- if (eob - bp < strlen((char *)cp) + 1)
+ if (eob - bp < (int)strlen((char *)cp) + 1)
return (-1);
if (ns_name_pton((char *)cp, buf, sizeof buf) < 0)
return (-1);
@@ -475,7 +475,7 @@
}
}
-int
+static int
verify_set(struct db_rrset *rrset) {
DST_KEY *key = NULL;
struct sig_record *sigdata;
@@ -529,13 +529,13 @@
* Don't verify a set if the SIG inception time is in
* the future. This should be fixed before 2038 (BEW)
*/
- if (ntohl(sigdata->sig_time_n) > now)
+ if ((time_t)ntohl(sigdata->sig_time_n) > now)
continue;
/* An expired set is dropped, but the data is not. */
- if (ntohl(sigdata->sig_exp_n) < now) {
- db_freedata(sigdp);
- sigdn->dp = NULL;
+ if ((time_t)ntohl(sigdata->sig_exp_n) < now) {
+ db_detach(&sigdn->dp);
+ sigdp = NULL;
continue;
}
@@ -717,8 +717,8 @@
if (ret < 0) {
dnssec_failed++;
- db_freedata(sigdp);
- sigdn->dp = NULL;
+ db_detach(&sigdn->dp);
+ sigdp = NULL;
}
else
dnssec_succeeded++;
@@ -748,40 +748,27 @@
}
static void
-rrset_free_partial(struct db_rrset *rrset, int free_data, struct dnode *start) {
+rrset_free(struct db_rrset *rrset) {
struct dnode *dnp;
- int found_start = 0;
ns_debug(ns_log_default, 5, "rrset_free(%s)", rrset->rr_name);
- if (start == NULL)
- found_start = 1;
-
while (rrset->rr_list) {
Home |
Main Index |
Thread Index |
Old Index