d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge in 4.9.3-P1 changes and bump version number.

Browse Source 
(Patch1 only affects named and BSD/OS makefiles that we dont use)
This commit is contained in:
Peter Wemm 1996-01-22 05:55:52 +00:00
parent b65097552f
commit a58206b6ea
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/named/Makefile
View File

@ -67,7 +67,7 @@ OBJS+= version.o
CLEANFILES+=version.c version.o CLEANFILES+=version.c version.o
SUBDIR= tools xfer SUBDIR= tools xfer
VER = 4.9.3-REL VER = 4.9.3-P1
version.c: ${.CURDIR}/Version.c ${.CURDIR}/Makefile ${SRCS} version.c: ${.CURDIR}/Version.c ${.CURDIR}/Makefile ${SRCS}
(LC_TIME=; export LC_TIME; u=$${USER-root} d=`pwd |sed -e 's|/obj/|/src/|'` \ (LC_TIME=; export LC_TIME; u=$${USER-root} d=`pwd |sed -e 's|/obj/|/src/|'` \

5
usr.sbin/named/ns_main.c
View File

@ -1,6 +1,6 @@
#if !defined(lint) && !defined(SABER) #if !defined(lint) && !defined(SABER)
static char sccsid[] = "@(#)ns_main.c 4.55 (Berkeley) 7/1/91"; 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 */ #endif /* not lint */
/* /*
@ -656,7 +656,8 @@ main(argc, argv, envp)
for (udpcnt = 0; udpcnt < 42; udpcnt++) { /*XXX*/ for (udpcnt = 0; udpcnt < 42; udpcnt++) { /*XXX*/
int from_len = sizeof(from_addr); 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) (struct sockaddr *)&from_addr, &from_len)) < 0)
{ {
#if defined(SPURIOUS_ECONNREFUSED) #if defined(SPURIOUS_ECONNREFUSED)

6
usr.sbin/named/ns_resp.c
View File

@ -1,6 +1,6 @@
#if !defined(lint) && !defined(SABER) #if !defined(lint) && !defined(SABER)
static char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91"; 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 */ #endif /* not lint */
/* /*
@ -944,10 +944,10 @@ ns_resp(msg, msglen)
*/ */
if ((!restart || !cname) && qp->q_cmsglen && ancount) { if ((!restart || !cname) && qp->q_cmsglen && ancount) {
dprintf(1, (ddt, "Cname second pass\n")); dprintf(1, (ddt, "Cname second pass\n"));
newmsglen = qp->q_cmsglen; newmsglen = MIN(PACKETSZ, qp->q_cmsglen);
bcopy(qp->q_cmsg, newmsg, newmsglen); bcopy(qp->q_cmsg, newmsg, newmsglen);
} else { } else {
newmsglen = msglen; newmsglen = MIN(PACKETSZ, msglen);
bcopy(msg, newmsg, newmsglen); bcopy(msg, newmsg, newmsglen);
} }
hp = (HEADER *) newmsg; hp = (HEADER *) newmsg;

2
usr.sbin/named/xfer/Makefile
View File

@ -10,7 +10,7 @@ BINDIR= /usr/libexec
MAN8= named-xfer.8 MAN8= named-xfer.8
VER = 4.9.3-REL VER = 4.9.3-P1
version.c: ${.CURDIR}/../Version.c ${.CURDIR}/Makefile ${SRCS} version.c: ${.CURDIR}/../Version.c ${.CURDIR}/Makefile ${SRCS}
(LC_TIME=; export LC_TIME; u=$${USER-root} d=`pwd |sed -e 's|/obj/|/src/|'` \ (LC_TIME=; export LC_TIME; u=$${USER-root} d=`pwd |sed -e 's|/obj/|/src/|'` \