diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1996-01-22 05:55:52 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1996-01-22 05:55:52 +0000 |
| commit | a58206b6ea986dd43472b00e9eb71df8f7363af6 (patch) | |
| tree | 34f5d44666d65631a83657a5ae8e73ba5e1a31ed /usr.sbin/named | |
| parent | b65097552f2ef90feaa7f92d90f26516080122a3 (diff) | |
| download | src-a58206b6ea986dd43472b00e9eb71df8f7363af6.tar.gz src-a58206b6ea986dd43472b00e9eb71df8f7363af6.zip | |
Merge in 4.9.3-P1 changes and bump version number.
(Patch1 only affects named and BSD/OS makefiles that we dont use)
Notes
Notes:
svn path=/head/; revision=13556
Diffstat (limited to 'usr.sbin/named')
| -rw-r--r-- | usr.sbin/named/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/named/ns_main.c | 5 | ||||
| -rw-r--r-- | usr.sbin/named/ns_resp.c | 6 | ||||
| -rw-r--r-- | usr.sbin/named/xfer/Makefile | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index b9abc6b942ed..0afe83e39c1c 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -67,7 +67,7 @@ OBJS+= version.o CLEANFILES+=version.c version.o SUBDIR= tools xfer -VER = 4.9.3-REL +VER = 4.9.3-P1 version.c: ${.CURDIR}/Version.c ${.CURDIR}/Makefile ${SRCS} (LC_TIME=; export LC_TIME; u=$${USER-root} d=`pwd |sed -e 's|/obj/|/src/|'` \ diff --git a/usr.sbin/named/ns_main.c b/usr.sbin/named/ns_main.c index 13576d704fa9..d0d39516aba0 100644 --- a/usr.sbin/named/ns_main.c +++ b/usr.sbin/named/ns_main.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_main.c 4.55 (Berkeley) 7/1/91"; -static char rcsid[] = "$Id: ns_main.c,v 1.5 1996/01/01 08:44:53 peter Exp $"; +static char rcsid[] = "$Id: ns_main.c,v 1.6 1996/01/07 05:48:33 peter Exp $"; #endif /* not lint */ /* @@ -656,7 +656,8 @@ main(argc, argv, envp) for (udpcnt = 0; udpcnt < 42; udpcnt++) { /*XXX*/ int from_len = sizeof(from_addr); - if ((n = recvfrom(dqp->dq_dfd, (char *)buf, sizeof(buf), 0, + if ((n = recvfrom(dqp->dq_dfd, (char *)buf, + MIN(PACKETSZ, sizeof buf), 0, (struct sockaddr *)&from_addr, &from_len)) < 0) { #if defined(SPURIOUS_ECONNREFUSED) diff --git a/usr.sbin/named/ns_resp.c b/usr.sbin/named/ns_resp.c index 0e78db67449c..756a0d467432 100644 --- a/usr.sbin/named/ns_resp.c +++ b/usr.sbin/named/ns_resp.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: ns_resp.c,v 1.4 1995/10/23 11:11:53 peter Exp $"; +static char rcsid[] = "$Id: ns_resp.c,v 1.5 1996/01/07 05:48:38 peter Exp $"; #endif /* not lint */ /* @@ -944,10 +944,10 @@ ns_resp(msg, msglen) */ if ((!restart || !cname) && qp->q_cmsglen && ancount) { dprintf(1, (ddt, "Cname second pass\n")); - newmsglen = qp->q_cmsglen; + newmsglen = MIN(PACKETSZ, qp->q_cmsglen); bcopy(qp->q_cmsg, newmsg, newmsglen); } else { - newmsglen = msglen; + newmsglen = MIN(PACKETSZ, msglen); bcopy(msg, newmsg, newmsglen); } hp = (HEADER *) newmsg; diff --git a/usr.sbin/named/xfer/Makefile b/usr.sbin/named/xfer/Makefile index bf26e94edb3a..d50a80106cc8 100644 --- a/usr.sbin/named/xfer/Makefile +++ b/usr.sbin/named/xfer/Makefile @@ -10,7 +10,7 @@ BINDIR= /usr/libexec MAN8= named-xfer.8 -VER = 4.9.3-REL +VER = 4.9.3-P1 version.c: ${.CURDIR}/../Version.c ${.CURDIR}/Makefile ${SRCS} (LC_TIME=; export LC_TIME; u=$${USER-root} d=`pwd |sed -e 's|/obj/|/src/|'` \ |