From owner-cvs-usrsbin Mon Jan 1 00:42:30 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA13245 for cvs-usrsbin-outgoing; Mon, 1 Jan 1996 00:42:30 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA13236 Mon, 1 Jan 1996 00:42:27 -0800 (PST) Date: Mon, 1 Jan 1996 00:42:27 -0800 (PST) From: Peter Wemm Message-Id: <199601010842.AAA13236@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/inetd Makefile inetd.c Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/01 00:42:26 Modified: usr.sbin/inetd Makefile inetd.c Log: Make inetd use setproctitle from libutil instead of it's own version. The old code can probably still be compiled with #define OLD_SETPROCTITLE Revision Changes Path 1.3 +3 -0 src/usr.sbin/inetd/Makefile 1.10 +32 -5 src/usr.sbin/inetd/inetd.c From owner-cvs-usrsbin Mon Jan 1 00:44:56 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA13354 for cvs-usrsbin-outgoing; Mon, 1 Jan 1996 00:44:56 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA13347 Mon, 1 Jan 1996 00:44:54 -0800 (PST) Date: Mon, 1 Jan 1996 00:44:54 -0800 (PST) From: Peter Wemm Message-Id: <199601010844.AAA13347@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/named ns_main.c Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/01 00:44:54 Modified: usr.sbin/named ns_main.c Log: Minimal changes to get named to use libutil's setproctitle()... The old code is still there with #ifdef OLD_SETPROCTITLE Revision Changes Path 1.5 +26 -1 src/usr.sbin/named/ns_main.c From owner-cvs-usrsbin Mon Jan 1 00:54:07 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA13523 for cvs-usrsbin-outgoing; Mon, 1 Jan 1996 00:54:07 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id AAA13514 Mon, 1 Jan 1996 00:54:04 -0800 (PST) Date: Mon, 1 Jan 1996 00:54:04 -0800 (PST) From: Peter Wemm Message-Id: <199601010854.AAA13514@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/sendmail/src Makefile conf.h Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/01 00:54:03 Modified: usr.sbin/sendmail/src Makefile conf.h Log: Get sendmail to detect when to use the setproctitle() in libutil This uses osreldate.h and other stuff to determine whether it's on a -current system. It should still compile cleanly on a -stable branch system. Revision Changes Path 1.7 +2 -2 src/usr.sbin/sendmail/src/Makefile 1.9 +11 -2 src/usr.sbin/sendmail/src/conf.h From owner-cvs-usrsbin Mon Jan 1 07:57:56 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id HAA25061 for cvs-usrsbin-outgoing; Mon, 1 Jan 1996 07:57:56 -0800 (PST) Received: from ibp.ibp.fr (ibp.ibp.fr [132.227.60.30]) by freefall.freebsd.org (8.7.3/8.7.3) with ESMTP id HAA25049 Mon, 1 Jan 1996 07:57:36 -0800 (PST) Received: from blaise.ibp.fr (blaise.ibp.fr [132.227.60.1]) by ibp.ibp.fr (8.6.12/jtpda-5.0) with ESMTP id QAA28166 ; Mon, 1 Jan 1996 16:57:34 +0100 Received: from (uucp@localhost) by blaise.ibp.fr (8.6.12/jtpda-5.0) with UUCP id QAA00245 ; Mon, 1 Jan 1996 16:57:34 +0100 Received: (from roberto@localhost) by keltia.freenix.fr (8.7.3/keltia-uucp-2.7) id PAA03725; Mon, 1 Jan 1996 15:03:27 +0100 (MET) From: Ollivier Robert Message-Id: <199601011403.PAA03725@keltia.freenix.fr> Subject: Re: cvs commit: src/usr.sbin/named ns_main.c To: peter@freefall.freebsd.org (Peter Wemm) Date: Mon, 1 Jan 1996 15:03:27 +0100 (MET) Cc: CVS-committers@freefall.freebsd.org, cvs-usrsbin@freefall.freebsd.org In-Reply-To: <199601010844.AAA13347@freefall.freebsd.org> from "Peter Wemm" at Jan 1, 96 00:44:54 am X-Operating-System: FreeBSD 2.2-CURRENT ctm#1503 X-Mailer: ELM [version 2.4 PL24 ME8b] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk It seems that Peter Wemm said: > peter 96/01/01 00:44:54 > > Modified: usr.sbin/named ns_main.c > Log: > Minimal changes to get named to use libutil's setproctitle()... Did you know that 4.9.3-REL of bind just came out ? :-) -- Ollivier ROBERT -=- The daemon is FREE! -=- roberto@keltia.frmug.fr.net FreeBSD keltia.freenix.fr 2.2-CURRENT #12: Sun Dec 31 16:05:48 MET 1995 From owner-cvs-usrsbin Mon Jan 1 08:26:14 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id IAA25901 for cvs-usrsbin-outgoing; Mon, 1 Jan 1996 08:26:14 -0800 (PST) Received: from jhome.DIALix.COM (root@jhome.DIALix.COM [192.203.228.69]) by freefall.freebsd.org (8.7.3/8.7.3) with ESMTP id IAA25896 Mon, 1 Jan 1996 08:26:07 -0800 (PST) Received: (from peter@localhost) by jhome.DIALix.COM (8.7.3/8.7.3) id AAA01637; Tue, 2 Jan 1996 00:25:51 +0800 (WST) Date: Tue, 2 Jan 1996 00:25:51 +0800 (WST) From: Peter Wemm To: Ollivier Robert cc: CVS-committers@freefall.freebsd.org, cvs-usrsbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.sbin/named ns_main.c In-Reply-To: <199601011403.PAA03725@keltia.freenix.fr> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk On Mon, 1 Jan 1996, Ollivier Robert wrote: > It seems that Peter Wemm said: > > peter 96/01/01 00:44:54 > > > > Modified: usr.sbin/named ns_main.c > > Log: > > Minimal changes to get named to use libutil's setproctitle()... > > Did you know that 4.9.3-REL of bind just came out ? :-) I've not read the bind or bind-workers mail in the last day or so.. But I new it was imminent as I've been talking with Paul Vixie about it (and gave it a "thumbs up" from a FreeBSD perspective once the bind version of compat/include/sys/cdefs.h was removed. -Peter > -- > Ollivier ROBERT -=- The daemon is FREE! -=- roberto@keltia.frmug.fr.net > FreeBSD keltia.freenix.fr 2.2-CURRENT #12: Sun Dec 31 16:05:48 MET 1995 > From owner-cvs-usrsbin Thu Jan 4 07:18:11 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id HAA09335 for cvs-usrsbin-outgoing; Thu, 4 Jan 1996 07:18:11 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id HAA09325 Thu, 4 Jan 1996 07:18:04 -0800 (PST) Date: Thu, 4 Jan 1996 07:18:04 -0800 (PST) From: Peter Wemm Message-Id: <199601041518.HAA09325@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/sup/supscan supscan.c Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/04 07:18:02 Modified: usr.sbin/sup/lib Makefile scan.c usr.sbin/sup/sup sup.1 usr.sbin/sup/supfilesrv supservers.8 usr.sbin/sup/supscan supscan.c Log: After having "imported" sup via a direct repository operation based on work done (some time ago) by Garrett Wollman, apply the ports/net/sup/patches/patch-ab (Garrett's version already has patch-aa) This is not connected to the Makefiles or modules yet. Revision Changes Path 1.2 +4 -1 src/usr.sbin/sup/lib/Makefile 1.2 +29 -12 src/usr.sbin/sup/lib/scan.c 1.2 +9 -4 src/usr.sbin/sup/sup/sup.1 1.2 +11 -0 src/usr.sbin/sup/supfilesrv/supservers.8 1.2 +47 -12 src/usr.sbin/sup/supscan/supscan.c From owner-cvs-usrsbin Thu Jan 4 07:21:00 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id HAA09694 for cvs-usrsbin-outgoing; Thu, 4 Jan 1996 07:21:00 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id HAA09683 Thu, 4 Jan 1996 07:20:58 -0800 (PST) Date: Thu, 4 Jan 1996 07:20:58 -0800 (PST) From: Peter Wemm Message-Id: <199601041520.HAA09683@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/sup/supscan Makefile Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/04 07:20:57 Modified: usr.sbin/sup Makefile usr.sbin/sup/lib Makefile usr.sbin/sup/sup Makefile usr.sbin/sup/supfilesrv Makefile usr.sbin/sup/supscan Makefile Log: Oops.. Missed $AHA$ -> $Id$ Revision Changes Path 1.2 +1 -1 src/usr.sbin/sup/Makefile 1.3 +1 -1 src/usr.sbin/sup/lib/Makefile 1.2 +2 -1 src/usr.sbin/sup/sup/Makefile 1.2 +2 -1 src/usr.sbin/sup/supfilesrv/Makefile 1.2 +2 -1 src/usr.sbin/sup/supscan/Makefile From owner-cvs-usrsbin Thu Jan 4 08:10:51 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id IAA13416 for cvs-usrsbin-outgoing; Thu, 4 Jan 1996 08:10:51 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id IAA13407 Thu, 4 Jan 1996 08:10:48 -0800 (PST) Date: Thu, 4 Jan 1996 08:10:48 -0800 (PST) From: Peter Wemm Message-Id: <199601041610.IAA13407@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/sup/sup sup.1 Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/04 08:10:47 Modified: usr.sbin/sup/lib Makefile usr.sbin/sup/sup sup.1 Log: Restore the changes I made after my last brain hiccup... Document /var/log/sup.rename instead of the old name Couple of lib build cleanups (like, not installing the library, and clean all files) It should be safe now.. :-) Revision Changes Path 1.3 +2 -1 src/usr.sbin/sup/lib/Makefile 1.4 +6 -3 src/usr.sbin/sup/sup/sup.1 From owner-cvs-usrsbin Fri Jan 5 01:09:36 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA20870 for cvs-usrsbin-outgoing; Fri, 5 Jan 1996 01:09:36 -0800 (PST) Received: (from graichen@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA20861 Fri, 5 Jan 1996 01:09:31 -0800 (PST) Date: Fri, 5 Jan 1996 01:09:31 -0800 (PST) From: Thomas Graichen Message-Id: <199601050909.BAA20861@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/spray - Imported sources Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk graichen 96/01/05 01:09:30 Branch: usr.sbin/spray 1.1.1 Log: Obtained from: NetBSD imported the spray command from NetBSD - it can be used for network analysis (see the man-page) Status: Vendor Tag: NETBSD Release Tags: v1_0 N src/usr.sbin/spray/spray.c N src/usr.sbin/spray/Makefile N src/usr.sbin/spray/spray.8 No conflicts created by this import From owner-cvs-usrsbin Fri Jan 5 01:28:22 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA22726 for cvs-usrsbin-outgoing; Fri, 5 Jan 1996 01:28:22 -0800 (PST) Received: (from graichen@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA22696 Fri, 5 Jan 1996 01:28:15 -0800 (PST) Date: Fri, 5 Jan 1996 01:28:15 -0800 (PST) From: Thomas Graichen Message-Id: <199601050928.BAA22696@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/newsyslog - Imported sources Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk graichen 96/01/05 01:28:13 Branch: usr.sbin/newsyslog 1.1.1 Log: Obtained from: NetBSD imported the newsyslog command from NetBSD - it make the "rotation" of the logfiles much simpler (it is currently done by "hand" in the /etc/[daily,weekly,monthly] scripts) - now it will be done by invoking newsyslog every hour which is very customizable via a /etc/newsyslog.conf file Status: Vendor Tag: NETBSD Release Tags: v1_0 N src/usr.sbin/newsyslog/newsyslog.c N src/usr.sbin/newsyslog/newsyslog.8 N src/usr.sbin/newsyslog/Makefile No conflicts created by this import From owner-cvs-usrsbin Fri Jan 5 01:42:03 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA23863 for cvs-usrsbin-outgoing; Fri, 5 Jan 1996 01:42:03 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA23849 Fri, 5 Jan 1996 01:41:58 -0800 (PST) Date: Fri, 5 Jan 1996 01:41:58 -0800 (PST) From: Peter Wemm Message-Id: <199601050941.BAA23849@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin Makefile Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/05 01:41:57 Modified: usr.sbin Makefile Log: Add sup and IPXrouted to makefile (IPXrouted is far more likely to be used than XNSrouted) Revision Changes Path 1.75 +8 -2 src/usr.sbin/Makefile From owner-cvs-usrsbin Fri Jan 5 01:53:55 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA25005 for cvs-usrsbin-outgoing; Fri, 5 Jan 1996 01:53:55 -0800 (PST) Received: (from graichen@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id BAA24998 Fri, 5 Jan 1996 01:53:53 -0800 (PST) Date: Fri, 5 Jan 1996 01:53:53 -0800 (PST) From: Thomas Graichen Message-Id: <199601050953.BAA24998@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin Makefile Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk graichen 96/01/05 01:53:51 Modified: usr.sbin Makefile Log: added newsyslog and spray Revision Changes Path 1.76 +3 -3 src/usr.sbin/Makefile From owner-cvs-usrsbin Fri Jan 5 23:20:01 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id XAA00280 for cvs-usrsbin-outgoing; Fri, 5 Jan 1996 23:20:01 -0800 (PST) Received: (from nate@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id XAA00266 Fri, 5 Jan 1996 23:19:58 -0800 (PST) Date: Fri, 5 Jan 1996 23:19:58 -0800 (PST) From: Nate Williams Message-Id: <199601060719.XAA00266@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/sliplogin pathnames.h sliplogin.8 sliplogin.c slip.hosts slip.login Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk nate 96/01/05 23:19:57 Branch: usr.sbin/sliplogin RELENG_2_1_0 Modified: usr.sbin/sliplogin pathnames.h sliplogin.8 sliplogin.c Removed: usr.sbin/sliplogin slip.hosts slip.login Log: Bring in changes from the HEAD. -Added support for the slip.hosts options 'normal', 'compress', 'noicmp', and 'autocmp'. -Additionly parse /etc/sliphome/slip.slparms* to set keepalive, outfill and slunit. -Make it more POSIXed. -Describe undocumented stuff. Revision Changes Path 1.1.1.1.6.1 +1 -0 src/usr.sbin/sliplogin/pathnames.h 1.1.1.1.6.1 +65 -7 src/usr.sbin/sliplogin/sliplogin.8 1.3.4.1 +154 -80 src/usr.sbin/sliplogin/sliplogin.c From owner-cvs-usrsbin Sat Jan 6 13:00:55 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA16510 for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 13:00:55 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA16495 Sat, 6 Jan 1996 13:00:49 -0800 (PST) Date: Sat, 6 Jan 1996 13:00:49 -0800 (PST) From: Peter Wemm Message-Id: <199601062100.NAA16495@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/mrouted - Imported sources Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/06 13:00:47 Branch: usr.sbin/mrouted 1.1.1 Log: This is a 'for reference' import of mrouted release 3.6. It's pure conflict markers, but it actually changes nothing. We've been running this code with small changes for some time, this may be useful for checking what those changes. It was unfortunate this module got so far away from the vendor branch (whitespace changes didn't help) Status: Vendor Tag: XEROX Release Tags: release_3_6 U src/usr.sbin/mrouted/LICENSE C src/usr.sbin/mrouted/callout.c C src/usr.sbin/mrouted/cfparse.y C src/usr.sbin/mrouted/config.c C src/usr.sbin/mrouted/defs.h C src/usr.sbin/mrouted/dvmrp.h C src/usr.sbin/mrouted/igmp.c C src/usr.sbin/mrouted/inet.c C src/usr.sbin/mrouted/kern.c C src/usr.sbin/mrouted/main.c C src/usr.sbin/mrouted/map-mbone.8 C src/usr.sbin/mrouted/mapper.c C src/usr.sbin/mrouted/mrinfo.8 C src/usr.sbin/mrouted/mrinfo.c C src/usr.sbin/mrouted/mrouted.8 C src/usr.sbin/mrouted/mtrace.8 C src/usr.sbin/mrouted/mtrace.c C src/usr.sbin/mrouted/pathnames.h C src/usr.sbin/mrouted/prune.c C src/usr.sbin/mrouted/prune.h C src/usr.sbin/mrouted/route.c C src/usr.sbin/mrouted/route.h C src/usr.sbin/mrouted/rsrr.c C src/usr.sbin/mrouted/rsrr.h C src/usr.sbin/mrouted/rsrr_var.h C src/usr.sbin/mrouted/vif.c C src/usr.sbin/mrouted/vif.h C src/usr.sbin/mrouted/mrouted.conf 27 conflicts created by this import. Use the following command to help the merge: cvs checkout -jXEROX:yesterday -jXEROX src/usr.sbin/mrouted From owner-cvs-usrsbin Sat Jan 6 13:04:50 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA16943 for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 13:04:50 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA16932 Sat, 6 Jan 1996 13:04:43 -0800 (PST) Date: Sat, 6 Jan 1996 13:04:43 -0800 (PST) From: Peter Wemm Message-Id: <199601062104.NAA16932@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/mrouted - Imported sources Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/06 13:04:41 Branch: usr.sbin/mrouted 1.1.1 Log: This is a 'for reference' import of mrouted release 3.8. I'm using these to try to resync our tree with the vendor branch.. Status: Vendor Tag: XEROX Release Tags: release_3_8 C src/usr.sbin/mrouted/callout.c C src/usr.sbin/mrouted/cfparse.y C src/usr.sbin/mrouted/config.c C src/usr.sbin/mrouted/defs.h C src/usr.sbin/mrouted/dvmrp.h C src/usr.sbin/mrouted/igmp.c C src/usr.sbin/mrouted/inet.c C src/usr.sbin/mrouted/kern.c C src/usr.sbin/mrouted/main.c C src/usr.sbin/mrouted/mapper.c C src/usr.sbin/mrouted/mrinfo.c C src/usr.sbin/mrouted/mtrace.c C src/usr.sbin/mrouted/pathnames.h C src/usr.sbin/mrouted/prune.c C src/usr.sbin/mrouted/prune.h C src/usr.sbin/mrouted/route.c C src/usr.sbin/mrouted/route.h C src/usr.sbin/mrouted/rsrr.c U src/usr.sbin/mrouted/rsrr.h U src/usr.sbin/mrouted/rsrr_var.h C src/usr.sbin/mrouted/vif.c C src/usr.sbin/mrouted/vif.h U src/usr.sbin/mrouted/LICENSE U src/usr.sbin/mrouted/map-mbone.8 C src/usr.sbin/mrouted/mrouted.conf U src/usr.sbin/mrouted/mrinfo.8 C src/usr.sbin/mrouted/mrouted.8 C src/usr.sbin/mrouted/mtrace.8 23 conflicts created by this import. Use the following command to help the merge: cvs checkout -jXEROX:yesterday -jXEROX src/usr.sbin/mrouted From owner-cvs-usrsbin Sat Jan 6 13:10:52 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA17568 for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 13:10:52 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA17555 Sat, 6 Jan 1996 13:10:46 -0800 (PST) Date: Sat, 6 Jan 1996 13:10:46 -0800 (PST) From: Peter Wemm Message-Id: <199601062110.NAA17555@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/mrouted callout.c cfparse.y config.c defs.h dvmrp.h igmp.c inet.c kern.c main.c mapper.c mrinfo.c mrouted.8 mrouted.conf mtrace.8 mtrace.c pathnames.h prune.c prune.h route.c route.h rsrr.c vif.c vif.h Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/06 13:10:45 Modified: usr.sbin/mrouted callout.c cfparse.y config.c defs.h dvmrp.h igmp.c inet.c kern.c main.c mapper.c mrinfo.c mrouted.8 mrouted.conf mtrace.8 mtrace.c pathnames.h prune.c prune.h route.c route.h rsrr.c vif.c vif.h Log: Resync our mainline to mrouted release 3.8. This will make FreeBSD boxes better behaved 'MBONE Citizens', based on a couple of the comments about the severity of fixes.. Agreed to by: wollman, fenner@parc.xerox.com Revision Changes Path 1.7 +23 -5 src/usr.sbin/mrouted/callout.c 1.3 +88 -15 src/usr.sbin/mrouted/cfparse.y 1.7 +1 -1 src/usr.sbin/mrouted/config.c 1.6 +33 -8 src/usr.sbin/mrouted/defs.h 1.5 +16 -3 src/usr.sbin/mrouted/dvmrp.h 1.9 +23 -7 src/usr.sbin/mrouted/igmp.c 1.5 +26 -5 src/usr.sbin/mrouted/inet.c 1.6 +22 -4 src/usr.sbin/mrouted/kern.c 1.7 +176 -63 src/usr.sbin/mrouted/main.c 1.6 +22 -7 src/usr.sbin/mrouted/mapper.c 1.8 +66 -45 src/usr.sbin/mrouted/mrinfo.c 1.5 +8 -3 src/usr.sbin/mrouted/mrouted.8 1.5 +7 -1 src/usr.sbin/mrouted/mrouted.conf 1.3 +23 -5 src/usr.sbin/mrouted/mtrace.8 1.7 +473 -127 src/usr.sbin/mrouted/mtrace.c 1.3 +1 -1 src/usr.sbin/mrouted/pathnames.h 1.10 +161 -193 src/usr.sbin/mrouted/prune.c 1.6 +1 -1 src/usr.sbin/mrouted/prune.h 1.6 +27 -7 src/usr.sbin/mrouted/route.c 1.5 +1 -1 src/usr.sbin/mrouted/route.h 1.4 +2 -1 src/usr.sbin/mrouted/rsrr.c 1.8 +236 -105 src/usr.sbin/mrouted/vif.c 1.5 +3 -3 src/usr.sbin/mrouted/vif.h From owner-cvs-usrsbin Sat Jan 6 13:12:24 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA17759 for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 13:12:24 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id NAA17748 Sat, 6 Jan 1996 13:12:19 -0800 (PST) Date: Sat, 6 Jan 1996 13:12:19 -0800 (PST) From: Peter Wemm Message-Id: <199601062112.NAA17748@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/mrouted - Imported sources Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/06 13:12:19 Branch: usr.sbin/mrouted 1.1.1 Log: Pull in the Release notes from release 3.8 - I forgot these last time after I had moved them out of the way. Status: Vendor Tag: XEROX Release Tags: release_3_8 N src/usr.sbin/mrouted/RELEASE No conflicts created by this import From owner-cvs-usrsbin Sat Jan 6 21:22:06 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id VAA16075 for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 21:22:06 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id VAA16058 Sat, 6 Jan 1996 21:22:02 -0800 (PST) Date: Sat, 6 Jan 1996 21:22:02 -0800 (PST) From: Peter Wemm Message-Id: <199601070522.VAA16058@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin - Imported sources Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/06 21:22:01 Branch: usr.sbin 1.1.1 Log: At last.. :-) Import of bind-4.9.3-REL. (part 1 of several) Status: Vendor Tag: VIXIE Release Tags: v4_9_3_rel U src/usr.sbin/named/db_defs.h C src/usr.sbin/named/db_dump.c C src/usr.sbin/named/db_func.h C src/usr.sbin/named/db_glob.h C src/usr.sbin/named/db_glue.c C src/usr.sbin/named/db_load.c C src/usr.sbin/named/db_lookup.c U src/usr.sbin/named/db_reload.c U src/usr.sbin/named/db_save.c C src/usr.sbin/named/db_secure.c C src/usr.sbin/named/db_update.c C src/usr.sbin/named/dmalloc.c U src/usr.sbin/named/dmalloc.h C src/usr.sbin/named/options.h U src/usr.sbin/named/named.h C src/usr.sbin/named/portability.h C src/usr.sbin/named/ns_defs.h C src/usr.sbin/named/ns_forw.c U src/usr.sbin/named/ns_func.h U src/usr.sbin/named/tree.c C src/usr.sbin/named/ns_glob.h C src/usr.sbin/named/ns_init.c C src/usr.sbin/named/ns_main.c C src/usr.sbin/named/ns_maint.c C src/usr.sbin/named/ns_ncache.c C src/usr.sbin/named/ns_req.c C src/usr.sbin/named/ns_resp.c C src/usr.sbin/named/ns_sort.c U src/usr.sbin/named/ns_stats.c C src/usr.sbin/named/ns_validate.c U src/usr.sbin/named/pathnames.h U src/usr.sbin/named/storage.c U src/usr.sbin/named/tree.h U src/usr.sbin/named/Version.c C src/usr.sbin/named/tools/ndc/ndc.sh U src/usr.sbin/named/tools/named.reload/named.reload.sh U src/usr.sbin/named/tools/named.restart/named.restart.sh C src/usr.sbin/named/xfer/named-xfer.c U src/usr.sbin/nslookup/commands.l U src/usr.sbin/nslookup/debug.c C src/usr.sbin/nslookup/getinfo.c U src/usr.sbin/nslookup/list.c C src/usr.sbin/nslookup/main.c U src/usr.sbin/nslookup/nslookup.help U src/usr.sbin/nslookup/pathnames.h U src/usr.sbin/nslookup/res.h U src/usr.sbin/nslookup/send.c U src/usr.sbin/nslookup/skip.c C src/usr.sbin/nslookup/subr.c 27 conflicts created by this import. Use the following command to help the merge: cvs checkout -jVIXIE:yesterday -jVIXIE src/usr.sbin From owner-cvs-usrsbin Sat Jan 6 21:48:53 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id VAA17446 for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 21:48:53 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id VAA17439 Sat, 6 Jan 1996 21:48:52 -0800 (PST) Date: Sat, 6 Jan 1996 21:48:52 -0800 (PST) From: Peter Wemm Message-Id: <199601070548.VAA17439@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/named/xfer Makefile named-xfer.c Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/06 21:48:51 Modified: usr.sbin/named Makefile db_dump.c db_func.h db_glob.h db_glue.c db_load.c db_lookup.c db_secure.c db_update.c dmalloc.c ns_defs.h ns_forw.c ns_glob.h ns_init.c ns_main.c ns_maint.c ns_ncache.c ns_req.c ns_resp.c ns_sort.c ns_validate.c options.h portability.h usr.sbin/named/tools/ndc ndc.sh usr.sbin/named/xfer Makefile named-xfer.c Log: Round 1 of the conflict merge. It now compiles.. Revision Changes Path 1.8 +1 -1 src/usr.sbin/named/Makefile 1.5 +11 -5 src/usr.sbin/named/db_dump.c 1.4 +4 -3 src/usr.sbin/named/db_func.h 1.3 +3 -3 src/usr.sbin/named/db_glob.h 1.5 +75 -46 src/usr.sbin/named/db_glue.c 1.5 +97 -50 src/usr.sbin/named/db_load.c 1.4 +7 -2 src/usr.sbin/named/db_lookup.c 1.4 +6 -14 src/usr.sbin/named/db_secure.c 1.4 +4 -7 src/usr.sbin/named/db_update.c 1.4 +3 -1 src/usr.sbin/named/dmalloc.c 1.4 +12 -2 src/usr.sbin/named/ns_defs.h 1.5 +69 -32 src/usr.sbin/named/ns_forw.c 1.5 +8 -2 src/usr.sbin/named/ns_glob.h 1.5 +32 -20 src/usr.sbin/named/ns_init.c 1.6 +64 -87 src/usr.sbin/named/ns_main.c 1.5 +280 -176 src/usr.sbin/named/ns_maint.c 1.4 +1 -1 src/usr.sbin/named/ns_ncache.c 1.5 +72 -66 src/usr.sbin/named/ns_req.c 1.5 +396 -342 src/usr.sbin/named/ns_resp.c 1.4 +3 -1 src/usr.sbin/named/ns_sort.c 1.4 +48 -49 src/usr.sbin/named/ns_validate.c 1.5 +4 -3 src/usr.sbin/named/options.h 1.4 +22 -2 src/usr.sbin/named/portability.h 1.3 +23 -12 src/usr.sbin/named/tools/ndc/ndc.sh 1.8 +1 -1 src/usr.sbin/named/xfer/Makefile 1.5 +22 -12 src/usr.sbin/named/xfer/named-xfer.c From owner-cvs-usrsbin Sat Jan 6 21:53:27 1996 Return-Path: owner-cvs-usrsbin Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id VAA17639 for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 21:53:27 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id VAA17632 Sat, 6 Jan 1996 21:53:26 -0800 (PST) Date: Sat, 6 Jan 1996 21:53:26 -0800 (PST) From: Peter Wemm Message-Id: <199601070553.VAA17632@freefall.freebsd.org> To: CVS-committers, cvs-usrsbin Subject: cvs commit: src/usr.sbin/nslookup getinfo.c main.c subr.c Sender: owner-cvs-usrsbin@FreeBSD.ORG Precedence: bulk peter 96/01/06 21:53:25 Modified: usr.sbin/nslookup getinfo.c main.c subr.c Log: Merge nslookup conflicts from 4.9.3-rel import Revision Changes Path 1.4 +26 -11 src/usr.sbin/nslookup/getinfo.c 1.4 +2 -2 src/usr.sbin/nslookup/main.c 1.6 +3 -3 src/usr.sbin/nslookup/subr.c