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/a4665e795f2e
branches: netbsd-1-5
changeset: 490559:a4665e795f2e
user: he <he%NetBSD.org@localhost>
date: Sun Jan 28 15:52:16 2001 +0000
description:
Pull up revision 1.2 (requested by itojun):
Upgrade to BIND version 8.2.3.
diffstat:
dist/bind/LICENSE | 4 +-
dist/bind/bin/dnskeygen/dnskeygen.c | 9 +-
dist/bind/bin/dnsquery/dnsquery.c | 23 +-
dist/bind/bin/irpd/irpd.c | 156 +--------------
dist/bind/bin/mkservdb/mkservdb.c | 29 +-
dist/bind/bin/named-bootconf/named-bootconf.sh | 32 ++-
dist/bind/bin/named/db_defs.h | 27 ++-
dist/bind/bin/named/db_func.h | 112 +++++-----
dist/bind/bin/named/db_glob.h | 7 +-
dist/bind/bin/named/db_ixfr.c | 241 +++++++++++++++---------
dist/bind/bin/named/db_lookup.c | 20 +-
dist/bind/bin/named/db_save.c | 8 +-
dist/bind/bin/named/db_sec.c | 8 +-
dist/bind/bin/named/db_tsig.c | 6 +-
dist/bind/bin/named/named.h | 7 +-
dist/bind/bin/named/ns_init.c | 38 ++-
dist/bind/bin/named/ns_ncache.c | 6 +-
dist/bind/bin/named/ns_parseutil.c | 4 +-
dist/bind/bin/named/ns_parseutil.h | 4 +-
dist/bind/bin/named/ns_signal.c | 9 +-
dist/bind/bin/named/ns_udp.c | 6 +-
dist/bind/bin/named/ns_xfr.c | 124 +++++++----
dist/bind/bin/named/pathtemplate.h | 10 +-
dist/bind/bin/nslookup/commands.l | 9 +-
dist/bind/bin/nslookup/list.c | 83 +------
dist/bind/bin/nslookup/main.c | 46 ++--
dist/bind/bin/nslookup/pathnames.h | 6 +-
dist/bind/bin/nslookup/res.h | 26 ++-
dist/bind/bin/nslookup/subr.c | 5 +-
dist/bind/bin/nsupdate/nsupdate.c | 31 +-
dist/bind/include/irs.h | 6 +-
dist/bind/include/isc/assertions.h | 20 +-
dist/bind/include/isc/list.h | 10 +-
dist/bind/include/isc/misc.h | 6 +-
dist/bind/lib/dst/bsafe_link.c | 4 +-
dist/bind/lib/dst/cylink_link.c | 4 +-
dist/bind/lib/dst/eay_dss_link.c | 4 +-
dist/bind/lib/dst/hmac_link.c | 4 +-
dist/bind/lib/dst/prandom.c | 6 +-
dist/bind/lib/dst/rsaref_link.c | 5 +-
dist/bind/lib/dst/support.c | 4 +-
dist/bind/lib/inet/inet_cidr_pton.c | 7 +-
dist/bind/lib/inet/inet_net_ntop.c | 10 +-
dist/bind/lib/inet/inet_ntop.c | 6 +-
dist/bind/lib/irs/dns.c | 6 +-
dist/bind/lib/irs/dns_ho.c | 23 +-
dist/bind/lib/irs/dns_sv.c | 23 +-
dist/bind/lib/irs/gen_gr.c | 12 +-
dist/bind/lib/irs/gethostent.c | 87 ++++++--
dist/bind/lib/irs/gethostent_r.c | 5 +-
dist/bind/lib/irs/getnameinfo.c | 21 +-
dist/bind/lib/irs/getnetent.c | 12 +-
dist/bind/lib/irs/getpwent.c | 6 +-
dist/bind/lib/irs/hesiod.c | 5 +-
dist/bind/lib/irs/irp.c | 13 +-
dist/bind/lib/irs/irpmarshall.c | 9 +-
dist/bind/lib/irs/lcl.c | 6 +-
dist/bind/lib/irs/nis.c | 6 +-
dist/bind/lib/irs/util.c | 10 +-
dist/bind/lib/isc/ctl_p.c | 8 +-
dist/bind/lib/isc/ev_connects.c | 39 ++-
dist/bind/lib/isc/logging.c | 25 ++-
dist/bind/lib/isc/logging_p.h | 4 +-
dist/bind/lib/nameser/ns_parse.c | 8 +-
dist/bind/lib/nameser/ns_print.c | 71 +++++-
dist/bind/lib/nameser/ns_sign.c | 5 +-
dist/bind/lib/nameser/ns_verify.c | 22 +-
dist/bind/lib/resolv/res_debug.h | 6 +-
dist/bind/lib/resolv/res_init.c | 46 +++-
dist/bind/lib/resolv/res_mkupdate.c | 6 +-
dist/bind/lib/resolv/res_query.c | 35 ++-
dist/bind/lib/resolv/res_sendsigned.c | 6 +-
72 files changed, 973 insertions(+), 744 deletions(-)
diffs (truncated from 4657 to 300 lines):
diff -r d13d7de53e95 -r a4665e795f2e dist/bind/LICENSE
--- a/dist/bind/LICENSE Sun Jan 28 15:52:03 2001 +0000
+++ b/dist/bind/LICENSE Sun Jan 28 15:52:16 2001 +0000
@@ -1,4 +1,4 @@
-## Copyright (c) 1993-1999 by Internet Software Consortium.
+## Copyright (c) 1993-2000 by Internet Software Consortium, Inc.
##
## Permission to use, copy, modify, and distribute this software for any
## purpose with or without fee is hereby granted, provided that the above
@@ -19,4 +19,4 @@
Tel: 1-888-868-1001 (toll free in U.S.)
Tel: 1-650-779-7091
Fax: 1-650-779-7055
- Email: info%isc.org@localhost
+ Email: <info%isc.org@localhost>
diff -r d13d7de53e95 -r a4665e795f2e dist/bind/bin/dnskeygen/dnskeygen.c
--- a/dist/bind/bin/dnskeygen/dnskeygen.c Sun Jan 28 15:52:03 2001 +0000
+++ b/dist/bind/bin/dnskeygen/dnskeygen.c Sun Jan 28 15:52:16 2001 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: dnskeygen.c,v 1.1.1.1 1999/11/20 18:53:58 veego Exp $ */
+/* $NetBSD: dnskeygen.c,v 1.1.1.1.8.1 2001/01/28 15:52:16 he Exp $ */
#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "Id: dnskeygen.c,v 1.9 1999/10/13 16:38:59 vixie Exp";
+static const char rcsid[] = "Id: dnskeygen.c,v 1.11 2000/12/23 08:14:31 vixie Exp";
#endif /* not lint */
/*
@@ -52,9 +52,8 @@
int size = -1, exp = 0;
int no_auth = 0, no_conf = 0;
int sign_val = 0, flags = 0, protocol = -1;
- int i, err = 0, n;
+ int i, err = 0;
extern char *optarg;
- char array[1024];
dst_init();
if ((prog = strrchr(argv[0],'/')) == NULL)
@@ -218,6 +217,8 @@
}
else if (size < 0)
usage("No size specified", 0);
+ else /* size == 0 */
+ sign_val = 0;
if (err)
usage("errors encountered/unknown flag", 1);
diff -r d13d7de53e95 -r a4665e795f2e dist/bind/bin/dnsquery/dnsquery.c
--- a/dist/bind/bin/dnsquery/dnsquery.c Sun Jan 28 15:52:03 2001 +0000
+++ b/dist/bind/bin/dnsquery/dnsquery.c Sun Jan 28 15:52:16 2001 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: dnsquery.c,v 1.1.1.1 1999/11/20 18:53:58 veego Exp $ */
+/* $NetBSD: dnsquery.c,v 1.1.1.1.8.1 2001/01/28 15:52:16 he Exp $ */
#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "Id: dnsquery.c,v 8.13 1999/10/13 16:38:59 vixie Exp";
+static const char rcsid[] = "Id: dnsquery.c,v 8.15 2000/12/23 08:14:32 vixie Exp";
#endif /* not lint */
/*
@@ -57,7 +57,6 @@
struct hostent *q_nsname;
extern int optind, opterr;
extern char *optarg;
- HEADER *hp;
int stream = 0, debug = 0;
/* set defaults */
@@ -82,7 +81,12 @@
case 'p' : res.retrans = atoi(optarg);
break;
- case 'h' : strcpy(name, optarg);
+ case 'h' : if (strlen(optarg) >= sizeof(name)) {
+ fprintf(stderr,
+ "Domain name too long (%s)\n", optarg);
+ exit(-1);
+ } else
+ strcpy(name, optarg);
break;
case 'c' : {
@@ -159,8 +163,15 @@
exit(-1);
}
}
- if (optind < argc)
- strcpy(name, argv[optind]);
+ if (optind < argc) {
+ if (strlen(argv[optind]) >= sizeof(name)) {
+ fprintf(stderr,
+ "Domain name too long (%s)\n", argv[optind]);
+ exit(-1);
+ } else {
+ strcpy(name, argv[optind]);
+ }
+ }
len = sizeof(answer);
diff -r d13d7de53e95 -r a4665e795f2e dist/bind/bin/irpd/irpd.c
--- a/dist/bind/bin/irpd/irpd.c Sun Jan 28 15:52:03 2001 +0000
+++ b/dist/bind/bin/irpd/irpd.c Sun Jan 28 15:52:16 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irpd.c,v 1.1.1.1 1999/11/20 18:53:59 veego Exp $ */
+/* $NetBSD: irpd.c,v 1.1.1.1.8.1 2001/01/28 15:52:16 he Exp $ */
/*
* Copyright(c) 1999 by Internet Software Consortium.
@@ -39,7 +39,7 @@
#endif
#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "Id: irpd.c,v 1.7 1999/10/13 16:26:23 vixie Exp";
+static const char rcsid[] = "Id: irpd.c,v 1.10 2000/12/23 08:14:33 vixie Exp";
#endif /* LIBC_SCCS and not lint */
/* Imports. */
@@ -146,7 +146,6 @@
static void release_buffer(struct response_buff *b);
static struct arg_s *split_string(const char *string);
static void free_args(struct arg_s *args);
-static int is_all_digits(char *p);
static struct client_ctx *make_cli_ctx(void);
static struct net_data *get_net_data(struct ctl_sess *sess);
@@ -250,8 +249,6 @@
const struct ctl_verb *verb, const char *rest,
u_int respflags, void *respctx, void *uctx);
-static void irpd_done(struct ctl_sctx *ctx, struct ctl_sess *sess,
- void *param);
static void response_done(struct ctl_sctx *ctx, struct ctl_sess *sess,
void *uap);
static void logger(enum ctl_severity, const char *fmt, ...);
@@ -331,9 +328,10 @@
main(int argc, char **argv) {
struct ctl_sctx *ctx;
struct sockaddr *addr;
+#ifndef NO_SOCKADDR_UN
struct sockaddr_un uaddr;
+#endif
struct sockaddr_in iaddr;
- log_channel chan;
short port = IRPD_PORT;
char *prog = argv[0];
char *sockname = IRPD_PATH;
@@ -344,7 +342,7 @@
addr = (struct sockaddr *)&iaddr;
socksize = sizeof iaddr;
- openlog("iprd", LOG_CONS|LOG_PID, LOG_DAEMON);
+ openlog("iprd", LOG_CONS|LOG_PID, ISC_FACILITY);
while ((ch = getopt(argc, argv, "u:p:c:")) != -1) {
switch(ch) {
case 'c':
@@ -360,11 +358,13 @@
}
break;
+#ifndef NO_SOCKADDR_UN
case 'u':
sockname = optarg;
addr = (struct sockaddr *)&uaddr;
socksize = sizeof uaddr;
break;
+#endif
case 'h':
case '?':
@@ -376,7 +376,6 @@
argc -= optind;
argv += optind;
- memset(&uaddr, 0, sizeof uaddr);
memset(&iaddr, 0, sizeof iaddr);
#ifdef HAVE_SA_LEN
@@ -386,17 +385,21 @@
iaddr.sin_port = htons(IRPD_PORT);
iaddr.sin_addr.s_addr = htonl(INADDR_ANY);
- uaddr.sun_family = AF_UNIX;
- strncpy(uaddr.sun_path, sockname, sizeof uaddr.sun_path);
+#ifndef NO_SOCKADDR_UN
+ memset(&uaddr, 0, sizeof uaddr);
+ if (addr == (struct sockaddr *)&uaddr) {
+ uaddr.sun_family = AF_UNIX;
+ strncpy(uaddr.sun_path, sockname, sizeof uaddr.sun_path);
#ifdef HAVE_SA_LEN
- uaddr.sun_len = SUN_LEN(&uaddr);
+ uaddr.sun_len = SUN_LEN(&uaddr);
#endif
- if (addr == (struct sockaddr *)&uaddr)
socksize = SUN_LEN(&uaddr);
- /* XXX what if this file is not currently a socket? */
- unlink(sockname);
+ /* XXX what if this file is not currently a socket? */
+ unlink(sockname);
+ }
+#endif
evCreate(&ev);
@@ -443,7 +446,6 @@
if (ho == NULL)
simple_response(sess, IRPD_GETHOST_NONE, "No such host");
else {
- size_t need;
struct response_buff *b = newbuffer(0);
if (irp_marshall_ho(ho, &b->buff, &b->bufflen) != 0) {
@@ -495,7 +497,6 @@
{
char hname[MAXHOSTNAMELEN];
struct arg_s *args;
- int i;
struct net_data *netdata = get_net_data(sess);
INSIST(netdata != NULL);
@@ -534,7 +535,6 @@
{
char hname[MAXHOSTNAMELEN];
struct arg_s *args;
- int i;
int af;
struct net_data *netdata = get_net_data(sess);
@@ -586,7 +586,6 @@
char haddr[MAXHOSTNAMELEN];
char tmpaddr[NS_IN6ADDRSZ];
struct arg_s *args;
- int i;
int af;
int addrlen;
struct net_data *netdata = get_net_data(sess);
@@ -652,9 +651,6 @@
u_int respflags, void *respctx, void *uctx)
{
struct hostent *ho;
- size_t need;
- size_t need_total = 0;
- struct response_buff *b;
struct net_data *netdata = get_net_data(sess);
INSIST(netdata != NULL);
@@ -678,10 +674,6 @@
const struct ctl_verb *verb, const char *rest,
u_int respflags, void *respctx, void *uctx)
{
- struct hostent *ho;
- size_t need;
- size_t need_total = 0;
- struct response_buff *b;
struct net_data *netdata = get_net_data(sess);
INSIST(netdata != NULL);
@@ -737,8 +729,6 @@
struct arg_s *args;
struct passwd *pw;
char username[64];
- struct response_buff *b;
- size_t need;
struct net_data *netdata = get_net_data(sess);
INSIST(netdata != NULL);
@@ -781,8 +771,6 @@
struct arg_s *args;
struct passwd *pw;
char userid[64];
- struct response_buff *b;
- size_t need;
struct net_data *netdata = get_net_data(sess);
INSIST(netdata != NULL);
@@ -842,9 +830,6 @@
u_int respflags, void *respctx, void *uctx)
{
struct passwd *pw;
- size_t need;
- size_t need_total = 0;
- struct response_buff *b;
struct net_data *netdata = get_net_data(sess);
INSIST(netdata != NULL);
@@ -867,10 +852,6 @@
const struct ctl_verb *verb, const char *rest,
u_int respflags, void *respctx, void *uctx)
{
- struct passwd *pw;
- size_t need;
- size_t need_total = 0;
- struct response_buff *b;
struct net_data *netdata = get_net_data(sess);
INSIST(netdata != NULL);
@@ -912,34 +893,6 @@
Home |
Main Index |
Thread Index |
Old Index