Subject: The Grand Reorganization Continues (#351 - 8 of 8)
Index:	MANY(mostly etc)/MANY 2.11BSD

Description:
	This is a continuation of the directory reorganization started
	in updates #335 thru 342.

	That series of updates was aimed at cleaning up /usr/lib (and to a
	very small extent /etc).  This series of updates (#344 thru 351)
	(almost) completes the reorganization by dispersing all but the
	config files from /etc into /sbin, /usr/sbin, /usr/libexec, usw.

Repeat-By:
	This is extracted from #335:

	"By observation and/or having to admin a mixture of 2.11BSD systems
	and systems which use the post 1989/90 directory hierarchy.

	Alternatively you may have, over the years, been one of the folks
	who has asked me "when is the directory layout going to be updated to
	reflect current 'standards'?""

Fix:
	This is #351 (part 8 of 8).

	Updates #344 thru #351 comprise the 8 part kit which moves everything
	that is not a config file out of /etc.

	NOTE: All executables in /etc *EXCEPT* /etc/init and /etc/autoconfig
	      are relocated by this update.  Those two programs were left in
	      /etc because:
	      
			/etc/init is known to the kernel - moving 'init'
			without changing the kernel would render the system
			unbootable.  Even if the kernel were updated there
			would be a big problem if an older kernel were to be
			used.

			/etc/autoconfig is known to 'init' and a change to
			'init' at this time (amidst all the other patching)
			was not thought to be a "good idea" at this time.

	The good news is that the update can be done "in place" - it will not
	be necessary to dump and reload the system.  The "bad news" is that
	a "make world" (recompile of the system from sources) is necessary.

	The rebuild is because two pathnames are widely known and/or
	implicitly referenced by *many* programs in the system:

		/etc/zoneinfo is used by the ctime() routine in libc.a and
		there are tens (hundreds?) of programs which call the ctime()
		family of functions.  Because /etc/zoneinfo is moved to 
		/usr/share/zoneinfo any program which references ctime()
		directly or indirectly needs to be relinked.

		The utmp file's pathname /etc/utmp is explicitly referenced
		by many programs in the system and since /etc/utmp is moved
		to /var/run/utmp all programs which read/write the utmp file
		need to be recompiled.

	The manifest is as follows:

	Part    Patch#	Contents
	----	-----	--------
	1	344	Manifest of files.  Introduction/tour.  Instructions. 
			Shell script to perform the relocation of directories.
			Suggested changes to locally modified files in /etc.  
			A 'shar' file containing a new 'whereis' program.

	2	345	Shar archive of all the new Makefiles which are to
			be installed on the system.  This is a separate part
			because it's ~60kb worth of makefiles.
	
	3-8	346-351	Patch files.  Broken into ~64kb pieces.

	As always these, and all previous updates to 2.11BSD, are available
	via anonymous FTP to either FTP.IIPO.GTEGSC.COM or MOE.2BSD.COM in
	the directory /pub/2.11BSD.

------------------------#351 Cut here----------------------
*** /usr/src/usr.sbin/config/Makefile.old	Mon Jan 18 08:46:35 1993
--- /usr/src/usr.sbin/config/Makefile	Sun Dec  1 10:40:05 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3 (Berkeley) 2/18/86
  #
  #
  CFILES=	config.c
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3.1 (2.11BSD) 1996/11/27
  #
  #
  CFILES=	config.c
***************
*** 13,18 ****
--- 13,20 ----
  CFLAGS=-O
  LDFLAGS=-ll
  
+ all:	config
+ 
  config: ${OBJS}
  	${CC} ${OBJS} ${SEPFLAG} -o config ${LDFLAGS}
  
***************
*** 20,46 ****
  	rm -f ${OBJS} lex.yy.c y.tab.c y.tab.h config
  
  install: config
! 	install -s config ${DESTDIR}/etc/config
  
  lint: ${CFILES}
  	lint ${CFILES}
  
! depend:
! 	grep '^#include' ${CFILES} | grep -v '<' | \
! 	sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' \
! 	    -e 's/\.c/.o/' \
! 	    -e 's,../[a-zA-Z]*/,,' | \
! 	awk ' { if ($$1 != prev) { print rec; rec = $$0; prev = $$1; } \
! 		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
! 		       else rec = rec " " $$2 } } \
! 	      END { print rec } ' > makedep
! 	echo '$$r makedep' >>eddep
! 	echo '/^# DO NOT DELETE THIS LINE/+1,$$d' >eddep
! 	echo '$$r makedep' >>eddep
! 	echo 'w' >>eddep
! 	cp Makefile Makefile.bak
! 	ed - Makefile < eddep
! 	rm eddep makedep
! 
! # DO NOT DELETE THIS LINE -- make depend uses it
! 
--- 22,31 ----
  	rm -f ${OBJS} lex.yy.c y.tab.c y.tab.h config
  
  install: config
! 	install -s config ${DESTDIR}/usr/sbin/config
  
  lint: ${CFILES}
  	lint ${CFILES}
  
! depend:	${CFILES}
! 	mkdep ${CFLAGS} ${CFILES}
*** /usr/src/usr.sbin/dev_mkdb/Makefile.old	Fri Feb  3 23:16:24 1995
--- /usr/src/usr.sbin/dev_mkdb/Makefile	Sat Nov 16 15:36:25 1996
***************
*** 1,7 ****
  #
  # Public Domain.  2/3/1995 - Steven Schultz
  #
! #	@(#)Makefile	1.0 (2.11BSD GTE) 2/3/95
  #
  CFLAGS=	 -O
  SEPFLAG= -i
--- 1,7 ----
  #
  # Public Domain.  2/3/1995 - Steven Schultz
  #
! #	@(#)Makefile	1.1 (2.11BSD GTE) 1996/11/16
  #
  CFLAGS=	 -O
  SEPFLAG= -i
***************
*** 26,32 ****
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 dev_mkdb ${DESTDIR}/etc/dev_mkdb
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
--- 26,32 ----
  
  install: all
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
! 	install -s -o root -g bin -m 755 dev_mkdb ${DESTDIR}/usr/sbin/dev_mkdb
  
  lint: ${SRCS}
  	lint -hax ${SRCS}
*** /usr/src/usr.sbin/diskpart/diskpart.8.old	Sun Dec 14 15:08:44 1986
--- /usr/src/usr.sbin/diskpart/diskpart.8	Sun Nov 17 18:22:41 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)diskpart.8	6.3 (Berkeley) 5/30/86
  .\"
! .TH DISKPART 8 "May 30, 1986"
  .UC 4
  .SH NAME
  diskpart \- calculate default disk partition sizes
  .SH SYNOPSIS
! .B /etc/diskpart
  [
  .B \-p
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)diskpart.8	6.3.1 (2.11BSD) 1996/11/17
  .\"
! .TH DISKPART 8 "November 17, 1996"
  .UC 4
  .SH NAME
  diskpart \- calculate default disk partition sizes
  .SH SYNOPSIS
! .B /usr/sbin/diskpart
  [
  .B \-p
  ] [
*** /usr/src/usr.sbin/gettable/gettable.8.old	Sun Dec 14 15:08:46 1986
--- /usr/src/usr.sbin/gettable/gettable.8	Sun Nov 17 18:34:39 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)gettable.8c	6.2 (Berkeley) 5/22/86
  .\"
! .TH GETTABLE 8C "May 22, 1986"
  .UC 5
  .SH NAME
  gettable \- get NIC format host tables from a host 
  .SH SYNOPSIS
! .B /etc/gettable
  [
  .B \-v
  ]
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)gettable.8	6.2.1 (2.11BSD) 1996/11/17
  .\"
! .TH GETTABLE 8 "November 17, 1996"
  .UC 5
  .SH NAME
  gettable \- get NIC format host tables from a host 
  .SH SYNOPSIS
! .B /usr/sbin/gettable
  [
  .B \-v
  ]
*** /usr/src/usr.sbin/htable/Makefile.old	Mon Jan 18 08:46:42 1993
--- /usr/src/usr.sbin/htable/Makefile	Sat Nov 16 20:12:01 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2 (Berkeley) 9/18/85
  #
  CFLAGS=	-O
  SEPFLAG= -i
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.2.1 (2.11BSD) 1996/11/16
  #
  CFLAGS=	-O
  SEPFLAG= -i
***************
*** 34,37 ****
  	rm -f ${ALL} *.o *.s parse.c scan.c y.tab.h errs
  
  install: htable
! 	install -s htable ${DESTDIR}/etc/htable
--- 34,37 ----
  	rm -f ${ALL} *.o *.s parse.c scan.c y.tab.h errs
  
  install: htable
! 	install -s htable ${DESTDIR}/usr/sbin/htable
*** /usr/src/usr.sbin/implog/implog.8.old	Sun Dec 14 15:08:46 1986
--- /usr/src/usr.sbin/implog/implog.8	Sat Nov 16 20:17:06 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)implog.8c	6.2 (Berkeley) 5/5/86
  .\"
! .TH IMPLOG 8C "May 5, 1986"
  .UC 5
  .SH NAME
  implog \- IMP log interpreter
  .SH SYNOPSIS
! .B /etc/implog
  [
  .B \-D
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)implog.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH IMPLOG 8 "November 16, 1996"
  .UC 5
  .SH NAME
  implog \- IMP log interpreter
  .SH SYNOPSIS
! .B /usr/sbin/implog
  [
  .B \-D
  ] [
*** /usr/src/usr.sbin/implogd/implogd.8.old	Sun Dec 14 15:08:46 1986
--- /usr/src/usr.sbin/implogd/implogd.8	Sat Nov 16 20:20:17 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)implogd.8c	6.2 (Berkeley) 5/22/86
  .\"
! .TH IMPLOGD 8C "May 22, 1986"
  .UC 5
  .SH NAME
  implogd \- IMP logger process
  .SH SYNOPSIS
! .B /etc/implogd
  [
  .B \-d
  ]
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)implogd.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH IMPLOGD 8 "November 16, 1996"
  .UC 5
  .SH NAME
  implogd \- IMP logger process
  .SH SYNOPSIS
! .B /usr/sbin/implogd
  [
  .B \-d
  ]
*** /usr/src/usr.sbin/kgmon/kgmon.8.old	Sun Dec 14 15:08:46 1986
--- /usr/src/usr.sbin/kgmon/kgmon.8	Sun Nov 17 18:43:32 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)kgmon.8	6.1 (Berkeley) 4/27/85
  .\"
! .TH KGMON 8 "April 27, 1985"
  .UC 5
  .SH NAME
  kgmon \- generate a dump of the operating system's profile buffers
  .SH SYNOPSIS
! .B /etc/kgmon
  [
  .B \-b
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)kgmon.8	6.1.1 (2.11BSD) 1996/11/17
  .\"
! .TH KGMON 8 "November 17, 1996"
  .UC 5
  .SH NAME
  kgmon \- generate a dump of the operating system's profile buffers
  .SH SYNOPSIS
! .B /usr/sbin/kgmon
  [
  .B \-b
  ] [
*** /usr/src/usr.sbin/lpr/Makefile.old	Thu Oct 24 14:37:18 1996
--- /usr/src/usr.sbin/lpr/Makefile	Sun Nov 17 22:53:11 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3.1 (2.11BSD) 1996/10/24
  #
  # makefile for line printer spooling system
  #
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3.2 (2.11BSD) 1996/11/17
  #
  # makefile for line printer spooling system
  #
***************
*** 71,77 ****
  	install -s -g ${SPGRP} -m 2711 lpc ${DESTDIR}/${SBINDIR}/lpc
  	install -s lptest ${DESTDIR}/${SBINDIR}/lptest
  	install -s pac ${DESTDIR}/${SBINDIR}/pac
! 	/etc/chown ${DAEMON} ${DESTDIR}/${SPOOLDIR}
  	chgrp ${SPGRP} ${DESTDIR}/${SPOOLDIR}
  	chmod 775 ${DESTDIR}/${SPOOLDIR}
  	cd filters; make ${MFLAGS} DESTDIR=${DESTDIR} install
--- 71,77 ----
  	install -s -g ${SPGRP} -m 2711 lpc ${DESTDIR}/${SBINDIR}/lpc
  	install -s lptest ${DESTDIR}/${SBINDIR}/lptest
  	install -s pac ${DESTDIR}/${SBINDIR}/pac
! 	chown ${DAEMON} ${DESTDIR}/${SPOOLDIR}
  	chgrp ${SPGRP} ${DESTDIR}/${SPOOLDIR}
  	chmod 775 ${DESTDIR}/${SPOOLDIR}
  	cd filters; make ${MFLAGS} DESTDIR=${DESTDIR} install
*** /usr/src/usr.sbin/mkhosts/mkhosts.8.old	Sun Dec 14 15:08:49 1986
--- /usr/src/usr.sbin/mkhosts/mkhosts.8	Sun Nov 17 18:53:41 1996
***************
*** 2,8 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mkhosts.8	6.3 (Berkeley) 5/23/86
  .\"
  .TH MKHOSTS 8 "May 23, 1986"
  .UC 6
--- 2,8 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mkhosts.8	6.3.1 (2.11BSD) 1996/11/17
  .\"
  .TH MKHOSTS 8 "May 23, 1986"
  .UC 6
***************
*** 9,15 ****
  .SH NAME
  mkhosts \- generate hashed host table
  .SH SYNOPSIS
! .B /etc/mkhosts
  [
  .B \-v
  ]
--- 9,15 ----
  .SH NAME
  mkhosts \- generate hashed host table
  .SH SYNOPSIS
! .B /usr/sbin/mkhosts
  [
  .B \-v
  ]
*** /usr/src/usr.sbin/mklost+found/mklost+found.8.old	Wed May 28 15:47:57 1986
--- /usr/src/usr.sbin/mklost+found/mklost+found.8	Sun Nov 17 19:19:17 1996
***************
*** 4,15 ****
  .\"
  .\"	@(#)mklost+found.8	6.1 (Berkeley) 4/27/85
  .\"
! .TH MKLOST+FOUND 8 "April 27, 1985"
  .UC 4
  .SH NAME
  mklost+found \- make a lost+found directory for fsck
  .SH SYNOPSIS
! .B /etc/mklost+found
  .SH DESCRIPTION
  A directory
  .I lost+found
--- 4,15 ----
  .\"
  .\"	@(#)mklost+found.8	6.1 (Berkeley) 4/27/85
  .\"
! .TH MKLOST+FOUND 8 "November 17, 1996"
  .UC 4
  .SH NAME
  mklost+found \- make a lost+found directory for fsck
  .SH SYNOPSIS
! .B /usr/sbin/mklost+found
  .SH DESCRIPTION
  A directory
  .I lost+found
***************
*** 17,27 ****
  are created therein and then removed so that there will be
  empty slots for
  .IR fsck (8).
! This command should not normally be needed since 
! .IR mkfs (8)
! automatically creates the
  .I lost+found
! directory when a new file system is created.
  .SH "SEE ALSO"
  fsck(8),
  mkfs(8)
--- 17,28 ----
  are created therein and then removed so that there will be
  empty slots for
  .IR fsck (8).
! .PP
! This command is obsolete because
! .IR fsck (8)
! automatically creates and extends the
  .I lost+found
! directory as needed.
  .SH "SEE ALSO"
  fsck(8),
  mkfs(8)
*** /usr/src/usr.sbin/mkproto/mkproto.8.old	Thu May 17 10:17:49 1990
--- /usr/src/usr.sbin/mkproto/mkproto.8	Sun Nov 17 20:12:03 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mkproto.8	6.1 (Berkeley) 4/27/85
  .\"
! .TH MKPROTO 8 "April 27, 1985"
  .UC 5
  .SH NAME
  mkproto \- construct a prototype file system
  .SH SYNOPSIS
! .B /etc/mkproto
  special proto
  .SH DESCRIPTION
  .I Mkproto
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mkproto.8	6.1.1 (2.11BSD) 1996/11/17
  .\"
! .TH MKPROTO 8 "November 17, 1996"
  .UC 5
  .SH NAME
  mkproto \- construct a prototype file system
  .SH SYNOPSIS
! .B /usr/sbin/mkproto
  special proto
  .SH DESCRIPTION
  .I Mkproto
*** /usr/src/usr.sbin/named/README.old	Wed Apr  6 08:51:56 1988
--- /usr/src/usr.sbin/named/README	Sat Nov 16 16:11:55 1996
***************
*** 34,44 ****
  9) create the master files (samples in master/*)
  10) edit /etc/rc.local to include:
  
! if [ -f /etc/named ]; then
!         /etc/named; echo -n ' named' >/dev/console
  fi
  
! 11) recompile network client and server programs that use gethostbyname, etc.
  
  
  Here is how to install the name server on 4.2BSD or similar systems.
--- 34,44 ----
  9) create the master files (samples in master/*)
  10) edit /etc/rc.local to include:
  
! if [ -f /usr/sbin/named ]; then
!         /usr/sbin/named; echo -n ' named' >/dev/console
  fi
  
! 11) recompile network client and server programs that use gethostbyname,...
  
  
  Here is how to install the name server on 4.2BSD or similar systems.
***************
*** 102,113 ****
  8) create the master files (samples in master/*)
  9) edit /etc/rc.local to include:
  
! if [ -f /etc/named ]; then
!         /etc/named; echo -n ' named' >/dev/console
  fi
  
  10) eventually, recompile network client and server programs that use
! gethostbyname, etc.
  
  If you have any problems or fixes send them to 
  
--- 102,113 ----
  8) create the master files (samples in master/*)
  9) edit /etc/rc.local to include:
  
! if [ -f /usr/sbin/named ]; then
!         /usr/sbin/named; echo -n ' named' >/dev/console
  fi
  
  10) eventually, recompile network client and server programs that use
! gethostbyname,...
  
  If you have any problems or fixes send them to 
  
*** /usr/src/usr.sbin/named/named/Makefile.old	Sun Jan  2 17:09:42 1994
--- /usr/src/usr.sbin/named/named/Makefile	Sun Dec  1 14:52:18 1996
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	@(#)Makefile	4.14 (Berkeley) 2/28/88
  #
  SEPFLAG= -i
  RES=
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	@(#)Makefile	4.14.1 (2.11BSD) 1996/11/16
  #
  SEPFLAG= -i
  RES=
***************
*** 19,25 ****
  ### ALLOC=storage.o
  CFLAGS=	-O ${DEFINES}
  LDFLAGS= ${RES} ${SEPFLAG}
- LIBC=	/lib/libc.a
  SRCS=	db_dump.c db_load.c db_lookup.c db_reload.c db_save.c db_update.c \
  	ns_forw.c ns_init.c ns_main.c ns_maint.c ns_req.c ns_resp.c \
  	ns_sort.c ns_stats.c
--- 19,24 ----
***************
*** 32,38 ****
  
  all: named
  
! named:	${OBJS} ${LIBC}
  	sh newvers.sh
  # You need overlays if you define DEBUG and STATS.
  #	${CC} ${LDFLAGS} -o $@ version.c ${BASE} -Z ${OBJS1} -Z ${OBJS2} -Y
--- 31,37 ----
  
  all: named
  
! named:	${OBJS}
  	sh newvers.sh
  # You need overlays if you define DEBUG and STATS.
  #	${CC} ${LDFLAGS} -o $@ version.c ${BASE} -Z ${OBJS1} -Z ${OBJS2} -Y
***************
*** 45,51 ****
  	mkdep ${CFLAGS} ${SRCS}
  
  install: named
! 	install -s -o root -g staff  -m 751 named ${DESTDIR}/etc/named
  
  lint: FRC
  	lint -Dlint ${CFLAGS} ${SRCS}
--- 44,50 ----
  	mkdep ${CFLAGS} ${SRCS}
  
  install: named
! 	install -s -o root -g staff  -m 751 named ${DESTDIR}/usr/sbin/named
  
  lint: FRC
  	lint -Dlint ${CFLAGS} ${SRCS}
*** /usr/src/usr.sbin/named/named/named.reload.old	Tue Jul 21 15:00:48 1987
--- /usr/src/usr.sbin/named/named/named.reload	Sat Nov 16 16:15:19 1996
***************
*** 1,5 ****
  #!/bin/csh
  #
! #	@(#)named.reload	1.1	(Berkeley)	86/12/08
  #
! kill -HUP `cat /etc/named.pid`
--- 1,5 ----
  #!/bin/csh
  #
! #	@(#)named.reload	1.1.1	(2.11BSD)	1996/11/16
  #
! kill -HUP `cat /var/run/named.pid`
*** /usr/src/usr.sbin/named/named/named.restart.old	Sun Dec  8 22:13:14 1985
--- /usr/src/usr.sbin/named/named/named.restart	Sat Nov 16 16:15:35 1996
***************
*** 1,2 ****
! kill -9 `cat /etc/named.pid`
! /etc/named 
--- 1,2 ----
! kill -9 `cat /var/run/named.pid`
! /usr/sbin/named 
*** /usr/src/usr.sbin/named/named/ns_main.c.old	Wed Sep  7 01:19:36 1988
--- /usr/src/usr.sbin/named/named/ns_main.c	Sat Nov 16 16:16:33 1996
***************
*** 10,23 ****
   * is provided ``as is'' without express or implied warranty.
   */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1986 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif /* not lint */
  
! #ifndef lint
! static char sccsid[] = "@(#)ns_main.c	4.30 (Berkeley) 3/7/88";
  #endif /* not lint */
  
  /*
--- 10,21 ----
   * is provided ``as is'' without express or implied warranty.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1986 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)ns_main.c	4.30.1 (2.11BSD) 1996/11/16";
  #endif /* not lint */
  
  /*
***************
*** 65,71 ****
  #ifdef PIDFILE 				/* file to store current named PID */
  char	*PidFile = PIDFILE;
  #else
! char	*PidFile = "/etc/named.pid";	
  #endif
  
  #ifndef FD_SET
--- 63,69 ----
  #ifdef PIDFILE 				/* file to store current named PID */
  char	*PidFile = PIDFILE;
  #else
! char	*PidFile = "/var/run/named.pid";	
  #endif
  
  #ifndef FD_SET
*** /usr/src/usr.sbin/named/tools/Makefile.old	Mon Apr 26 10:16:06 1993
--- /usr/src/usr.sbin/named/tools/Makefile	Sun Dec  1 14:53:14 1996
***************
*** 14,37 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	4.9 (Berkeley) 10/10/88
  #
  CFLAGS=	-O
  RES=
- LIBC=	/lib/libc.a
  SRCS=	nsquery.c nstest.c
  OBJS=
  
  all: nsquery nstest nslookup
  
! nsquery: ${LIBC}
! 	${CC} ${CFLAGS} -i -o $@ nsquery.c ${RES}
  
  # test programs and utilities
! nstest: ${LIBC}
  	@echo "The resolver routines in libc must be compiled with the -DDEBUG"
  	@echo "option or nstest will not have any output."
! 	${CC} ${CFLAGS} -i -o $@ nstest.c ${RES}
  
  nslookup: FRC
  	cd nslookup; make ${MFLAGS} RES=${RES}
--- 14,36 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	4.9.1 (2.11BSD) 1996/12/1
  #
  CFLAGS=	-O
  RES=
  SRCS=	nsquery.c nstest.c
  OBJS=
  
  all: nsquery nstest nslookup
  
! nsquery: nsquery.o
! 	${CC} ${CFLAGS} -i -o $@ nsquery.o ${RES}
  
  # test programs and utilities
! nstest: nstest.o
  	@echo "The resolver routines in libc must be compiled with the -DDEBUG"
  	@echo "option or nstest will not have any output."
! 	${CC} ${CFLAGS} -i -o $@ nstest.o ${RES}
  
  nslookup: FRC
  	cd nslookup; make ${MFLAGS} RES=${RES}
*** /usr/src/usr.sbin/named/tools/nslookup/Makefile.old	Mon Oct 21 21:44:30 1996
--- /usr/src/usr.sbin/named/tools/nslookup/Makefile	Sun Dec  1 14:53:43 1996
***************
*** 14,24 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.20.1 (2.11BSD) 1996/10/21
  #
  CFLAGS=	-O
  RES=
- LIBC=	/lib/libc.a
  LIBS=	-ll ${RES}
  CSRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c res_debug.c
  SRCS=	${CSRCS} commands.c
--- 14,23 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.20.2 (2.11BSD) 1996/12/1
  #
  CFLAGS=	-O
  RES=
  LIBS=	-ll ${RES}
  CSRCS=	main.c getinfo.c debug.c send.c skip.c list.c subr.c res_debug.c
  SRCS=	${CSRCS} commands.c
***************
*** 27,33 ****
  
  all: nslookup nslookup.0
  
! nslookup: ${OBJS} ${LIBC}
  	${CC} -i -o $@ ${OBJS} ${LIBS}
  
  clean:
--- 26,32 ----
  
  all: nslookup nslookup.0
  
! nslookup: ${OBJS}
  	${CC} -i -o $@ ${OBJS} ${LIBS}
  
  clean:
*** /usr/src/usr.sbin/ntp/Makefile.old	Sat Feb  5 20:18:46 1994
--- /usr/src/usr.sbin/ntp/Makefile	Sun Dec  1 18:17:09 1996
***************
*** 1,4 ****
! # $Source: /usr/users/louie/ntp/RCS/Makefile,v $ $Revision: 3.4.1.7 $ $Date: 89/05/18 12:43:32 $
  #
  # $Log:	Makefile,v $
  # Revision 3.4.1.7  89/05/18  12:43:32  louie
--- 1,4 ----
! # @(#) Makefile 1.0 (2.11BSD) 1996/12/1
  #
  # $Log:	Makefile,v $
  # Revision 3.4.1.7  89/05/18  12:43:32  louie
***************
*** 55,77 ****
  # verify that certain arithmetic operations are done correctly on the
  # host that the code is being compiled on.
  # 
- # 
- #
  DESTDIR=
- INCPATH=
  LDFLAGS= -i
! BINDIR=/etc
! LINKDIR=/etc
  LIBS=
  
  VERS=3.4
  
! #CC=gcc -g -W -Wall
! #CC=gcc -g -W
  
- INSTALL= install -c
- 
- #
  # FEATURES include:
  #	DEBUG	  - include DEBUG code
  #	BROADCAST_NTP - experimental support for broadcast NTP
--- 55,69 ----
  # verify that certain arithmetic operations are done correctly on the
  # host that the code is being compiled on.
  # 
  DESTDIR=
  LDFLAGS= -i
! BINDIR=/usr/sbin
  LIBS=
  
  VERS=3.4
  
! INSTALL= install -c -s -m 755
  
  # FEATURES include:
  #	DEBUG	  - include DEBUG code
  #	BROADCAST_NTP - experimental support for broadcast NTP
***************
*** 94,100 ****
  FEATURES= -DDEBUG -DLOG_NTP=LOG_LOCAL3
  #FEATURES= -DBROADCAST_NTP -DSETTICKADJ -DDEBUG -DLOG_NTP=LOG_LOCAL3
  
! # for 2.10.1BSD
  DEFINES= -DGENERIC_UNS_BUG -DSUN_FLT_BUG
  
  # for 4.3 BSD
--- 86,92 ----
  FEATURES= -DDEBUG -DLOG_NTP=LOG_LOCAL3
  #FEATURES= -DBROADCAST_NTP -DSETTICKADJ -DDEBUG -DLOG_NTP=LOG_LOCAL3
  
! # for 2.11BSD
  DEFINES= -DGENERIC_UNS_BUG -DSUN_FLT_BUG
  
  # for 4.3 BSD
***************
*** 114,120 ****
  # for a NeXT system, define these pre-processor symbols.
  #DEFINES=-DSUN_FLT_BUG -DGENERIC_UNS_BUG 
  
! CFLAGS= -O ${DEFINES} ${FEATURES} ${INCPATH}
  #
  # Header files
  #
--- 106,112 ----
  # for a NeXT system, define these pre-processor symbols.
  #DEFINES=-DSUN_FLT_BUG -DGENERIC_UNS_BUG 
  
! CFLAGS= -O ${DEFINES} ${FEATURES}
  #
  # Header files
  #
***************
*** 132,144 ****
  	read_psti.o
  OBJS=	ntp.o ntpdc.o ${NTPDOBJ}
  
- 
- DIST= README Makefile man ${SRCS} ${HDRS} ntp.conf test.c extract.pl stat.pl
  PROGS=	ntp ntpd ntpdc ntest
  
! all:	${PROGS}
  	@./ntest
  
  ntp:	ntp.o ntpsubs.o
  	${CC} ${LDFLAGS} -o ntp ntp.o ntpsubs.o ${LIBS}
  
--- 124,137 ----
  	read_psti.o
  OBJS=	ntp.o ntpdc.o ${NTPDOBJ}
  
  PROGS=	ntp ntpd ntpdc ntest
  
! all:	${PROGS} man
  	@./ntest
  
+ man:	FRC
+ 	cd man; make ${MFLAGS} DESTDIR=${DESTDIR} all
+ 
  ntp:	ntp.o ntpsubs.o
  	${CC} ${LDFLAGS} -o ntp ntp.o ntpsubs.o ${LIBS}
  
***************
*** 145,150 ****
--- 138,145 ----
  ntpd:	${NTPDOBJ}
  	${CC} ${LDFLAGS} -o ntpd ${NTPDOBJ} ${LIBS}
  
+ FRC:
+ 
  ntpdc: ntpdc.o
  	${CC} ${LDFLAGS} -o ntpdc ntpdc.o ${LIBS}
  
***************
*** 154,205 ****
  sock_test: ntp_sock.c
  	${CC} ${LDFLAGS} -DTEST -o sock_test ntp_sock.c ${LIBS}
  
! ${OBJS}:	ntp.h Makefile
  ntpd.o:	patchlevel.h
  
! install: ${DESTDIR}${BINDIR}/ntpd ${DESTDIR}${BINDIR}/ntp ${DESTDIR}${BINDIR}/ntpdc ntest
  	@./ntest
- #
- # If you don't want a symlink to the daemon, comment out the next line
- #	make ${MFLAGS} DESTDIR=${DESTDIR} install-link
- 
- ${DESTDIR}${BINDIR}/ntpd:	ntpd
  	${INSTALL}  ntpd ${DESTDIR}${BINDIR}/ntpd
- 
- ${DESTDIR}${BINDIR}/ntp:	ntp
  	${INSTALL}  ntp ${DESTDIR}${BINDIR}/ntp
- 
- ${DESTDIR}${BINDIR}/ntpdc:	ntpdc
  	${INSTALL}  ntpdc ${DESTDIR}${BINDIR}/ntpdc
- 
- install-man:
  	cd man; make ${MFLAGS} DESTDIR=${DESTDIR} install
  
- install-link:
- 	rm -f ${BINDIR}/${LINKDIR}/ntpd
- 	ln -s ${BINDIR}/ntpd ${DESTDIR}/${LINKDIR}/ntpd
- 
- print:
- 	enscript -2r -p - Makefile ${HDRS} ${SRCS} | qpr -q lps40
- 
  clean:
! 	@rm -f *.o *~ core ${PROGS} ntp.tar ntest sock_test
  	cd man; make ${MFLAGS} DESTDIR=${DESTDIR} clean
  
  lint:
  	lint -bac ${DEFINES} ${NTPDSRC}
- 
- dist:	ntp.tar.Z
- 	mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp.tar.Z
- 
- test-dist:	ntp.tar.Z
- 	mv ntp.tar.Z /usr/ftp/pub/ntp.${VERS}/ntp-test.tar.Z
- 
- ntp.tar.Z:	${DIST}
- 	rm -f ntp.tar ntp.tar.Z
- 	tar cf ntp.tar ${DIST}
- 	compress  ntp.tar
- 
  
  depend:
  	mkdep $(CFLAGS) $(SRCS)
--- 149,170 ----
  sock_test: ntp_sock.c
  	${CC} ${LDFLAGS} -DTEST -o sock_test ntp_sock.c ${LIBS}
  
! ${OBJS}:	ntp.h
  ntpd.o:	patchlevel.h
  
! install: ${PROGS}
  	@./ntest
  	${INSTALL}  ntpd ${DESTDIR}${BINDIR}/ntpd
  	${INSTALL}  ntp ${DESTDIR}${BINDIR}/ntp
  	${INSTALL}  ntpdc ${DESTDIR}${BINDIR}/ntpdc
  	cd man; make ${MFLAGS} DESTDIR=${DESTDIR} install
  
  clean:
! 	rm -f *.o *~ ${PROGS} ntest sock_test
  	cd man; make ${MFLAGS} DESTDIR=${DESTDIR} clean
  
  lint:
  	lint -bac ${DEFINES} ${NTPDSRC}
  
  depend:
  	mkdep $(CFLAGS) $(SRCS)
*** /usr/src/usr.sbin/ntp/man/Makefile.old	Fri Jan 22 22:16:41 1993
--- /usr/src/usr.sbin/ntp/man/Makefile	Sun Dec  1 17:48:33 1996
***************
*** 1,5 ****
  DESTDIR=
! MANDIR=/usr/new/man/cat8
  MANSRC= ntp.8 ntpd.8 ntpdc.8
  MAN= ntp.0 ntpd.0 ntpdc.0
  
--- 1,5 ----
  DESTDIR=
! MANDIR=/usr/man/cat8
  MANSRC= ntp.8 ntpd.8 ntpdc.8
  MAN= ntp.0 ntpd.0 ntpdc.0
  
*** /usr/src/usr.sbin/ntp/man/ntpd.8.old	Mon Feb 20 20:58:40 1989
--- /usr/src/usr.sbin/ntp/man/ntpd.8	Wed Nov 27 21:14:07 1996
***************
*** 1,8 ****
! .TH NTPD 8 "9 December 1988" LOCAL "Clockwatcher's Programming Manual"
  .SH NAME
  ntpd \- time synchronization daemon implementing NTP
  .SH SYNOPSIS
! .B /usr/local/etc/ntpd
  [-d] [-s] [-t]
  .SH OPTIONS
  .B -d
--- 1,8 ----
! .TH NTPD 8 "27 November 1996" LOCAL "Clockwatcher's Programming Manual"
  .SH NAME
  ntpd \- time synchronization daemon implementing NTP
  .SH SYNOPSIS
! .B ntpd
  [-d] [-s] [-t]
  .SH OPTIONS
  .B -d
***************
*** 55,61 ****
  When
  .IR ntpd (8)
  is started on the machine, it reads configuration information from
! .I /etc/ntpd.conf
  which contains information about other 
  .I ntp
  time servers and host specific information.  Configuration information is
--- 55,61 ----
  When
  .IR ntpd (8)
  is started on the machine, it reads configuration information from
! .I /etc/ntp.conf
  which contains information about other 
  .I ntp
  time servers and host specific information.  Configuration information is
*** /usr/src/usr.sbin/pstat/pstat.8.old	Wed May 28 15:48:00 1986
--- /usr/src/usr.sbin/pstat/pstat.8	Sun Nov 17 20:19:06 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)pstat.8	6.3 (Berkeley) 5/24/86
  .\"
! .TH PSTAT 8 "May 24, 1986"
  .UC 4
  .SH NAME
  pstat \- print system facts
  .SH SYNOPSIS
! .B /etc/pstat
  .B \-aixptufT
  [
  .B suboptions
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)pstat.8	6.3.1 (2.11BSD) 1996/11/17
  .\"
! .TH PSTAT 8 "November 17, 1996"
  .UC 4
  .SH NAME
  pstat \- print system facts
  .SH SYNOPSIS
! .B /usr/sbin/pstat
  .B \-aixptufT
  [
  .B suboptions
*** /usr/src/usr.sbin/quotaon/Makefile.old	Sat Nov 16 15:27:13 1996
--- /usr/src/usr.sbin/quotaon/Makefile	Sat Nov 16 15:31:48 1996
***************
*** 0 ****
--- 1,41 ----
+ #
+ # Public Domain.  1996/11/16 - Steven Schultz
+ #
+ #	@(#)Makefile	1.0 (2.11BSD) 1996/11/16
+ #
+ CFLAGS=	 -O
+ SEPFLAG= -i
+ SRCS=	quotaon.c
+ OBJS=	quotaon.o
+ MAN=	quotaon.0
+ MANSRC=	quotaon.8
+ 
+ all: quotaon quotaon.0
+ 
+ quotaon: ${OBJS}
+ 	${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS}
+ 
+ quotaon.0: ${MANSRC}
+ 	/usr/man/manroff ${MANSRC} > ${MAN}
+ 
+ clean:
+ 	rm -f ${OBJS} ${MAN} quotaon tags 
+ 
+ depend: ${SRCS}
+ 	mkdep ${CFLAGS} ${SRCS}
+ 
+ install: quotaon
+ 	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
+ 	-rm -f ${DESTDIR}/usr/man/cat8/quotaoff.0
+ 	ln ${DESTDIR}/usr/man/cat8/quotaon.0 ${DESTDIR}/usr/man/cat8/quotaoff.0
+ 	install -s -o root -g bin -m 755 quotaon ${DESTDIR}/usr/sbin/quotaon
+ 	-rm -f ${DESTDIR}/usr/sbin/quotaoff
+ 	ln ${DESTDIR}/usr/sbin/quotaon ${DESTDIR}/usr/sbin/quotaoff
+ 
+ lint: ${SRCS}
+ 	lint -hax ${SRCS}
+ 
+ tags: ${SRCS}
+ 	ctags ${SRCS}
+ # DO NOT DELETE THIS LINE -- mkdep uses it.
+ # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
*** /usr/src/usr.sbin/rmt/rmt.8.old	Sun Dec 14 15:08:47 1986
--- /usr/src/usr.sbin/rmt/rmt.8	Sun Nov 17 20:40:44 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rmt.8c	6.1 (Berkeley) 4/27/85
  .\"
! .TH RMT 8C "April 27, 1985"
  .UC 5
  .SH NAME
  rmt \- remote magtape protocol module
  .SH SYNOPSIS
! .B /etc/rmt
  .SH DESCRIPTION
  .I Rmt
  is a program used by the remote dump and restore programs
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rmt.8	6.1.1 (2.11BSD) 1996/11/17
  .\"
! .TH RMT 8 "November 17, 1996"
  .UC 5
  .SH NAME
  rmt \- remote magtape protocol module
  .SH SYNOPSIS
! .B rmt
  .SH DESCRIPTION
  .I Rmt
  is a program used by the remote dump and restore programs
***************
*** 17,25 ****
  communication connection.
  .I Rmt
  is normally started up with an
! .IR rexec (3X)
  or
! .IR rcmd (3X)
  call.
  .PP
  The 
--- 17,25 ----
  communication connection.
  .I Rmt
  is normally started up with an
! .IR rexec (3)
  or
! .IR rcmd (3)
  call.
  .PP
  The 
***************
*** 141,151 ****
  .SH DIAGNOSTICS
  All responses are of the form described above.
  .SH "SEE ALSO"
! rcmd(3X),
! rexec(3X),
  mtio(4),
! rdump(8C),
! rrestore(8C)
  .SH BUGS
  People tempted to use this for a remote file access protocol
  are discouraged.
--- 141,151 ----
  .SH DIAGNOSTICS
  All responses are of the form described above.
  .SH "SEE ALSO"
! rcmd(3),
! rexec(3),
  mtio(4),
! rdump(8),
! rrestore(8)
  .SH BUGS
  People tempted to use this for a remote file access protocol
  are discouraged.
*** /usr/src/usr.sbin/rwhod/rwhod.8.old	Sun Dec 14 15:08:48 1986
--- /usr/src/usr.sbin/rwhod/rwhod.8	Sat Nov 16 21:01:09 1996
***************
*** 2,21 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rwhod.8c	6.2 (Berkeley) 5/24/86
  .\"
! .TH RWHOD 8C "May 24, 1986"
  .UC 5
  .SH NAME
  rwhod \- system status server
  .SH SYNOPSIS
! .B /etc/rwhod
  .SH DESCRIPTION
  .I Rwhod
  is the server which maintains the database used by the
! .IR rwho (1C)
  and
! .IR ruptime (1C)
  programs.  Its operation is predicated on the ability to
  .I broadcast
  messages on a network.
--- 2,21 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rwhod.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH RWHOD 8 "November 16, 1996"
  .UC 5
  .SH NAME
  rwhod \- system status server
  .SH SYNOPSIS
! .B /usr/sbin/rwhod
  .SH DESCRIPTION
  .I Rwhod
  is the server which maintains the database used by the
! .IR rwho (1)
  and
! .IR ruptime (1)
  programs.  Its operation is predicated on the ability to
  .I broadcast
  messages on a network.
***************
*** 100,107 ****
  the possibility that this file is not the system
  image currently operating.
  .SH "SEE ALSO"
! rwho(1C),
! ruptime(1C)
  .SH BUGS
  There should be a way to relay status information between networks. 
  Status information should be sent only upon request rather than continuously.
--- 100,107 ----
  the possibility that this file is not the system
  image currently operating.
  .SH "SEE ALSO"
! rwho(1),
! ruptime(1)
  .SH BUGS
  There should be a way to relay status information between networks. 
  Status information should be sent only upon request rather than continuously.
*** /usr/src/usr.sbin/rwhod/rwhod.c.old	Fri Jan 20 23:44:02 1995
--- /usr/src/usr.sbin/rwhod/rwhod.c	Sat Nov 16 21:12:32 1996
***************
*** 9,16 ****
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)rwhod.c	5.9.1 (2.11BSD) 1/16/95";
! #endif not lint
  
  #include <sys/param.h>
  #include <sys/types.h>
--- 9,16 ----
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)rwhod.c	5.9.2 (2.11BSD) 1996/11/16";
! #endif
  
  #include <sys/param.h>
  #include <sys/types.h>
***************
*** 25,30 ****
--- 25,32 ----
  
  #include <stdio.h>
  #include <signal.h>
+ #include <unistd.h>
+ #include <string.h>
  #include <errno.h>
  #include <utmp.h>
  #include <ctype.h>
***************
*** 40,48 ****
  
  struct	sockaddr_in sin = { AF_INET };
  
- extern	errno;
- 
- time_t	time();
  char	myname[MAXHOSTNAMELEN];
  
  /*
--- 42,47 ----
***************
*** 68,75 ****
  #define	RWHODIR		"/usr/spool/rwho"
  
  int	onalrm(), getboottime();
! char	*strcpy(), *sprintf(), *malloc();
! long	lseek();
  
  main()
  {
--- 67,73 ----
  #define	RWHODIR		"/usr/spool/rwho"
  
  int	onalrm(), getboottime();
! 	char	*Utmp = _PATH_UTMP;
  
  main()
  {
***************
*** 78,84 ****
  	char path[64];
  	int on = 1;
  	char *cp;
- 	extern char *index();
  
  	if (getuid()) {
  		fprintf(stderr, "rwhod: not super user\n");
--- 76,81 ----
***************
*** 121,133 ****
  	if ((cp = index(myname, '.')) != NULL)
  		*cp = '\0';
  	strncpy(mywd.wd_hostname, myname, sizeof (myname) - 1);
! 	utmpf = open("/etc/utmp", O_RDONLY);
  	if (utmpf < 0) {
! 		(void) close(creat("/etc/utmp", 0644));
! 		utmpf = open("/etc/utmp", O_RDONLY);
  	}
  	if (utmpf < 0) {
! 		syslog(LOG_ERR, "/etc/utmp: %m");
  		exit(1);
  	}
  	getboottime(0);
--- 118,130 ----
  	if ((cp = index(myname, '.')) != NULL)
  		*cp = '\0';
  	strncpy(mywd.wd_hostname, myname, sizeof (myname) - 1);
! 	utmpf = open(Utmp, O_RDONLY);
  	if (utmpf < 0) {
! 		(void) close(creat(Utmp, 0644));
! 		utmpf = open(Utmp, O_RDONLY);
  	}
  	if (utmpf < 0) {
! 		syslog(LOG_ERR, "%s: %m", Utmp);
  		exit(1);
  	}
  	getboottime(0);
***************
*** 268,274 ****
  		(void) lseek(utmpf, (long)0, L_SET);
  		cc = read(utmpf, (char *)utmp, (int)stb.st_size);
  		if (cc < 0) {
! 			perror("/etc/utmp");
  			goto done;
  		}
  		wlast = &mywd.wd_we[1024 / sizeof (struct whoent) - 1];
--- 265,271 ----
  		(void) lseek(utmpf, (long)0, L_SET);
  		cc = read(utmpf, (char *)utmp, (int)stb.st_size);
  		if (cc < 0) {
! 			perror(Utmp);
  			goto done;
  		}
  		wlast = &mywd.wd_we[1024 / sizeof (struct whoent) - 1];
***************
*** 369,375 ****
  		np = (struct neighbor *)malloc(sizeof (*np));
  		if (np == NULL)
  			continue;
! 		np->n_name = malloc(strlen(ifr->ifr_name) + 1);
  		if (np->n_name == NULL) {
  			free((char *)np);
  			continue;
--- 366,372 ----
  		np = (struct neighbor *)malloc(sizeof (*np));
  		if (np == NULL)
  			continue;
! 		np->n_name = (char *)malloc(strlen(ifr->ifr_name) + 1);
  		if (np->n_name == NULL) {
  			free((char *)np);
  			continue;
***************
*** 376,382 ****
  		}
  		strcpy(np->n_name, ifr->ifr_name);
  		np->n_addrlen = sizeof (ifr->ifr_addr);
! 		np->n_addr = malloc(np->n_addrlen);
  		if (np->n_addr == NULL) {
  			free(np->n_name);
  			free((char *)np);
--- 373,379 ----
  		}
  		strcpy(np->n_name, ifr->ifr_name);
  		np->n_addrlen = sizeof (ifr->ifr_addr);
! 		np->n_addr = (char *)malloc(np->n_addrlen);
  		if (np->n_addr == NULL) {
  			free(np->n_name);
  			free((char *)np);
*** /usr/src/usr.sbin/rxformat/rxformat.8.old	Tue Aug 18 11:55:35 1987
--- /usr/src/usr.sbin/rxformat/rxformat.8	Sun Nov 17 21:02:25 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rxformat.8v	6.4 (Berkeley) 8/18/87
  .\"
! .TH RXFORMAT 8V "August 18, 1987"
  .UC 2
  .SH NAME
! rxformat \- format floppy disks (2.10BSD)
  .SH SYNOPSIS
! .B /etc/rxformat
  special
  .SH DESCRIPTION
  The
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rxformat.8	6.4.1 (2.11BSD) 1996/11/17
  .\"
! .TH RXFORMAT 8 "November 17, 1996"
  .UC 2
  .SH NAME
! rxformat \- format floppy disks (2.11BSD)
  .SH SYNOPSIS
! .B rxformat
  special
  .SH DESCRIPTION
  The
*** /usr/src/usr.sbin/sa/sa.8.old	Sun Dec 14 15:08:43 1986
--- /usr/src/usr.sbin/sa/sa.8	Sun Nov 17 21:04:17 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)sa.8	6.2 (Berkeley) 7/29/85
  .\"
! .TH SA 8 "July 29, 1985"
  .UC 4
  .SH NAME
  sa, accton \- system accounting
  .SH SYNOPSIS
! .B /etc/sa
  [
  .B \-abcdDfijkKlnrstuv
  ] [
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)sa.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH SA 8 "November 16, 1996"
  .UC 4
  .SH NAME
  sa, accton \- system accounting
  .SH SYNOPSIS
! .B sa
  [
  .B \-abcdDfijkKlnrstuv
  ] [
***************
*** 18,24 ****
  .B \-U
  usracctfile ] [ file ]
  .PP
! .B /etc/accton 
  [ file ]
  .SH DESCRIPTION
  With an argument naming an existing
--- 18,24 ----
  .B \-U
  usracctfile ] [ file ]
  .PP
! .B accton 
  [ file ]
  .SH DESCRIPTION
  With an argument naming an existing
*** /usr/src/usr.sbin/sendmail.MX/aux/mail-dm.c.old	Mon Jul 25 20:16:24 1983
--- /usr/src/usr.sbin/sendmail.MX/aux/mail-dm.c	Fri Nov 29 20:42:52 1996
***************
*** 9,15 ****
  #include <log.h>
  extern int fout;
  
! static char SccsId[] = "@(#)mail-dm.c	4.1	7/25/83";
  
  /*
  Name:
--- 9,17 ----
  #include <log.h>
  extern int fout;
  
! #if	!defined(lint) && defined(DOSCCS)
! static char SccsId[] = "@(#)mail-dm.c	4.1.1	1996/11/29";
! #endif
  
  /*
  Name:
***************
*** 247,253 ****
  **		Fork.
  **			Signal "unavailable" and exit on failure
  **			In child:
! **				Call mailer: /etc/delivermail is preferred.
  **			In parent:
  **				Avoid pipe signals in case delivermail dies.
  **				Save the childs pid.
--- 249,255 ----
  **		Fork.
  **			Signal "unavailable" and exit on failure
  **			In child:
! **				Call mailer: delivermail is preferred.
  **			In parent:
  **				Avoid pipe signals in case delivermail dies.
  **				Save the childs pid.
***************
*** 267,273 ****
  **		-1 on failure.
  **
  **	Side Effects:
! **		Forks /etc/delivermail or /bin/mail or /usr/bin/mail.
  **		Becomes "network" in the child.
  **
  **	Requires:
--- 269,275 ----
  **		-1 on failure.
  **
  **	Side Effects:
! **		Forks /usr/sbin/delivermail or /bin/mail or /usr/bin/mail.
  **		Becomes "network" in the child.
  **
  **	Requires:
***************
*** 292,301 ****
  **		11/26/79 -- Modified to map upper case to lower
  **			case.  Eric Allman UCB/INGRES.
  **		11/10/79 -- Written by Eric Allman UCB/INGRES
! **		3/6/80 -- Dropped case mapping; delivermail does
  **			that now.  EPA UCB/INGRES.
  **		8/19/81 -- Added "mode" parameter; call sendmail
! **			instead of delivermail.  EPA
  */
  
  int Mail_pid;
--- 294,303 ----
  **		11/26/79 -- Modified to map upper case to lower
  **			case.  Eric Allman UCB/INGRES.
  **		11/10/79 -- Written by Eric Allman UCB/INGRES
! **		3/6/80 -- Dropped case mapping; /usr/sbin/delivermail does
  **			that now.  EPA UCB/INGRES.
  **		8/19/81 -- Added "mode" parameter; call sendmail
! **			instead of /usr/sbin/delivermail.  EPA
  */
  
  int Mail_pid;
***************
*** 345,351 ****
  		setuid(NETUID);
  
  		/* try to call something to deliver the mail */
! 		execl("/etc/sendmail", "sendmail", "-v", mode == 1 ? "-af" : "-am", w, 0);
  
  		/* doesn't seem to be anything around */
  		netreply("455 Mail server unavailable\r\n");
--- 347,353 ----
  		setuid(NETUID);
  
  		/* try to call something to deliver the mail */
! 		execl("/usr/sbin/sendmail", "sendmail", "-v", mode == 1 ? "-af" : "-am", w, 0);
  
  		/* doesn't seem to be anything around */
  		netreply("455 Mail server unavailable\r\n");
*** /usr/src/usr.sbin/sendmail.MX/cf.hosttable/guessing.old	Mon Oct 21 14:18:43 1985
--- /usr/src/usr.sbin/sendmail.MX/cf.hosttable/guessing	Sun Nov 17 22:54:50 1996
***************
*** 103,109 ****
  4. The change to syslog priorities didn't get made in the bbnnet directory.
  Each occurrence of KERN_RECOV should be changed to LOG_INFO.
  
! 5. The binary of /etc/arp was out of date.  Recompilation will fix it.
  This was due to a change in <netinet/if_ether.h>.
  
  6. There was a bug in ftp, finger and probably other programs that tried
--- 103,109 ----
  4. The change to syslog priorities didn't get made in the bbnnet directory.
  Each occurrence of KERN_RECOV should be changed to LOG_INFO.
  
! 5. The binary of arp was out of date.  Recompilation will fix it.
  This was due to a change in <netinet/if_ether.h>.
  
  6. There was a bug in ftp, finger and probably other programs that tried
*** /usr/src/usr.sbin/sendmail/aux/mail-dm.c.old	Wed Feb 18 01:11:10 1987
--- /usr/src/usr.sbin/sendmail/aux/mail-dm.c	Fri Nov 29 20:42:52 1996
***************
*** 9,15 ****
  #include <log.h>
  extern int fout;
  
! static char SccsId[] = "@(#)mail-dm.c	4.1	7/25/83";
  
  /*
  Name:
--- 9,17 ----
  #include <log.h>
  extern int fout;
  
! #if	!defined(lint) && defined(DOSCCS)
! static char SccsId[] = "@(#)mail-dm.c	4.1.1	1996/11/29";
! #endif
  
  /*
  Name:
***************
*** 247,253 ****
  **		Fork.
  **			Signal "unavailable" and exit on failure
  **			In child:
! **				Call mailer: /etc/delivermail is preferred.
  **			In parent:
  **				Avoid pipe signals in case delivermail dies.
  **				Save the childs pid.
--- 249,255 ----
  **		Fork.
  **			Signal "unavailable" and exit on failure
  **			In child:
! **				Call mailer: delivermail is preferred.
  **			In parent:
  **				Avoid pipe signals in case delivermail dies.
  **				Save the childs pid.
***************
*** 267,273 ****
  **		-1 on failure.
  **
  **	Side Effects:
! **		Forks /etc/delivermail or /bin/mail or /usr/bin/mail.
  **		Becomes "network" in the child.
  **
  **	Requires:
--- 269,275 ----
  **		-1 on failure.
  **
  **	Side Effects:
! **		Forks /usr/sbin/delivermail or /bin/mail or /usr/bin/mail.
  **		Becomes "network" in the child.
  **
  **	Requires:
***************
*** 292,301 ****
  **		11/26/79 -- Modified to map upper case to lower
  **			case.  Eric Allman UCB/INGRES.
  **		11/10/79 -- Written by Eric Allman UCB/INGRES
! **		3/6/80 -- Dropped case mapping; delivermail does
  **			that now.  EPA UCB/INGRES.
  **		8/19/81 -- Added "mode" parameter; call sendmail
! **			instead of delivermail.  EPA
  */
  
  int Mail_pid;
--- 294,303 ----
  **		11/26/79 -- Modified to map upper case to lower
  **			case.  Eric Allman UCB/INGRES.
  **		11/10/79 -- Written by Eric Allman UCB/INGRES
! **		3/6/80 -- Dropped case mapping; /usr/sbin/delivermail does
  **			that now.  EPA UCB/INGRES.
  **		8/19/81 -- Added "mode" parameter; call sendmail
! **			instead of /usr/sbin/delivermail.  EPA
  */
  
  int Mail_pid;
***************
*** 345,351 ****
  		setuid(NETUID);
  
  		/* try to call something to deliver the mail */
! 		execl("/etc/sendmail", "sendmail", "-v", mode == 1 ? "-af" : "-am", w, 0);
  
  		/* doesn't seem to be anything around */
  		netreply("455 Mail server unavailable\r\n");
--- 347,353 ----
  		setuid(NETUID);
  
  		/* try to call something to deliver the mail */
! 		execl("/usr/sbin/sendmail", "sendmail", "-v", mode == 1 ? "-af" : "-am", w, 0);
  
  		/* doesn't seem to be anything around */
  		netreply("455 Mail server unavailable\r\n");
*** /usr/src/usr.sbin/sendmail/aux/newsyslog.old	Wed Feb 18 01:11:12 1987
--- /usr/src/usr.sbin/sendmail/aux/newsyslog	Sun Nov 17 22:55:43 1996
***************
*** 10,13 ****
  mv syslog    syslog.0
  cp /dev/null syslog
  chmod 666    syslog
! kill -1 `cat /etc/syslog.pid`
--- 10,13 ----
  mv syslog    syslog.0
  cp /dev/null syslog
  chmod 666    syslog
! kill -1 `cat /var/run/syslog.pid`
*** /usr/src/usr.sbin/syslogd/syslogd.8.old	Sun Dec 14 15:08:47 1986
--- /usr/src/usr.sbin/syslogd/syslogd.8	Sun Nov 17 21:27:21 1996
***************
*** 2,14 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)syslogd.8	6.5 (Berkeley) 5/26/86
! .TH SYSLOGD 8 "May 26, 1986"
  .UC 5
  .SH NAME
  syslogd \- log systems messages
  .SH SYNOPSIS
! .B /etc/syslogd
  [
  .BI \-f configfile
  ] [
--- 2,14 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)syslogd.8	6.5.1 (2.11BSD) 1996/11/16
! .TH SYSLOGD 8 "November 16, 1996"
  .UC 5
  .SH NAME
  syslogd \- log systems messages
  .SH SYNOPSIS
! .B syslogd
  [
  .BI \-f configfile
  ] [
***************
*** 162,168 ****
  Turn on debugging.
  .PP
  .I Syslogd
! creates the file /etc/syslog.pid, if possible,
  containing a single line with its process id.
  This can be used to kill or reconfigure
  .I syslogd.
--- 162,168 ----
  Turn on debugging.
  .PP
  .I Syslogd
! creates the file /var/run/syslog.pid, if possible,
  containing a single line with its process id.
  This can be used to kill or reconfigure
  .I syslogd.
***************
*** 170,181 ****
  To bring
  .I syslogd
  down,
! it should be sent a terminate signal (e.g. kill \`cat /etc/syslog.pid\`).
  .SH FILES
! .ta \w'/etc/syslog.conf    'u
  .nf
  /etc/syslog.conf	the configuration file
! /etc/syslog.pid	the process id
  /dev/log	Name of the UNIX domain datagram log socket
  /dev/klog	The kernel log device
  .fi
--- 170,181 ----
  To bring
  .I syslogd
  down,
! it should be sent a terminate signal (e.g. kill \`cat /var/run/syslog.pid\`).
  .SH FILES
! .ta \w'/var/run/syslog.conf    'u
  .nf
  /etc/syslog.conf	the configuration file
! /var/run/syslog.pid	the process id
  /dev/log	Name of the UNIX domain datagram log socket
  /dev/klog	The kernel log device
  .fi
*** /usr/src/usr.sbin/syslogd/syslogd.c.old	Fri Mar 22 23:06:26 1996
--- /usr/src/usr.sbin/syslogd/syslogd.c	Sat Nov 16 21:19:01 1996
***************
*** 9,15 ****
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)syslogd.c	5.13.3 (2.11BSD GTE) 1996/3/22";
  #endif
  
  /*
--- 9,15 ----
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)syslogd.c	5.13.4 (2.11BSD GTE) 1996/11/16";
  #endif
  
  /*
***************
*** 67,73 ****
  
  char	*LogName = "/dev/log";
  char	*ConfFile = "/etc/syslog.conf";
! char	*PidFile = "/etc/syslog.pid";
  char	ctty[] = "/dev/console";
  
  #define FDMASK(fd)	(1 << (fd))
--- 67,73 ----
  
  char	*LogName = "/dev/log";
  char	*ConfFile = "/etc/syslog.conf";
! char	*PidFile = "/var/run/syslog.pid";
  char	ctty[] = "/dev/console";
  
  #define FDMASK(fd)	(1 << (fd))
***************
*** 620,627 ****
  		return;
  
  	/* open the user login file */
! 	if ((uf = fopen("/etc/utmp", "r")) == NULL) {
! 		logerror("/etc/utmp");
  		reenter = 0;
  		return;
  	}
--- 620,627 ----
  		return;
  
  	/* open the user login file */
! 	if ((uf = fopen(_PATH_UTMP, "r")) == NULL) {
! 		logerror(_PATH_UTMP);
  		reenter = 0;
  		return;
  	}
*** /usr/src/usr.sbin/timed/Makefile.old	Sat Aug 29 16:31:16 1987
--- /usr/src/usr.sbin/timed/Makefile	Sat Nov 16 21:49:30 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	2.1	(Berkeley)	12/10/85
  #
  # optional flags are: MEASURE TESTING DEBUG
  
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	2.1.1	(2.11BSD)	1996/11/16
  #
  # optional flags are: MEASURE TESTING DEBUG
  
***************
*** 45,52 ****
  	cc ${SEPFLAG} ${CFLAGS} ${OBJCS} ${COMMO} ${LIBS} -o timedc
  
  install: ${PROGRS}
! 	install -s timed ${DESTDIR}/etc
! 	install -s -o root -m 4511 timedc ${DESTDIR}/etc
  
  clean:
  	rm -f a.out core *.o Makefile.bak errs ${PROGRS}
--- 45,52 ----
  	cc ${SEPFLAG} ${CFLAGS} ${OBJCS} ${COMMO} ${LIBS} -o timedc
  
  install: ${PROGRS}
! 	install -s timed ${DESTDIR}/usr/sbin
! 	install -s -o root -m 4511 timedc ${DESTDIR}/usr/sbin
  
  clean:
  	rm -f a.out core *.o Makefile.bak errs ${PROGRS}
***************
*** 55,177 ****
  	lint ${SRCDS} ${COMMS}
  	lint ${SRCCS} ${COMMS}
  
! depend:
! 	for i in ${SRCCS} ${SRCDS} ${COMMS}; do \
! 	    cc -M ${CFLAGS} $$i | awk ' { if ($$1 != prev) \
! 		{ if (rec != "") print rec; rec = $$0; prev = $$1; } \
! 		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
! 		else rec = rec " " $$2 } } \
! 		END { print rec } ' >> makedep; done
! 	echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
! 	echo '$$r makedep' >>eddep
! 	echo 'w' >>eddep
! 	cp Makefile Makefile.bak
! 	ed - Makefile < eddep
! 	rm eddep makedep
! 	echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
! 	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
! 	echo '# see make depend above' >> Makefile
  
! # DO NOT DELETE THIS LINE -- make depend uses it
! 
! cmds.o: cmds.c ./timedc.h /usr/include/sys/param.h
! cmds.o: /usr/include/machine/machparam.h /usr/include/signal.h
! cmds.o: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/sys/time.h
! cmds.o: /usr/include/time.h /usr/include/errno.h /usr/include/sys/socket.h
! cmds.o: /usr/include/netinet/in.h /usr/include/netdb.h /usr/include/arpa/inet.h
! cmds.o: /usr/include/netinet/in_systm.h /usr/include/netinet/ip.h
! cmds.o: /usr/include/netinet/ip_icmp.h /usr/include/protocols/timed.h
! cmds.o: /usr/include/sys/file.h
! cmdtab.o: cmdtab.c ./timedc.h /usr/include/sys/param.h
! cmdtab.o: /usr/include/machine/machparam.h /usr/include/signal.h
! cmdtab.o: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/sys/time.h
! cmdtab.o: /usr/include/time.h /usr/include/errno.h /usr/include/sys/socket.h
! cmdtab.o: /usr/include/netinet/in.h /usr/include/netdb.h
! cmdtab.o: /usr/include/arpa/inet.h
! timedc.o: timedc.c ./timedc.h /usr/include/sys/param.h
! timedc.o: /usr/include/machine/machparam.h /usr/include/signal.h
! timedc.o: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/sys/time.h
! timedc.o: /usr/include/time.h /usr/include/errno.h /usr/include/sys/socket.h
! timedc.o: /usr/include/netinet/in.h /usr/include/netdb.h
! timedc.o: /usr/include/arpa/inet.h /usr/include/signal.h /usr/include/ctype.h
! timedc.o: /usr/include/setjmp.h /usr/include/syslog.h
! acksend.o: acksend.c ./globals.h /usr/include/sys/param.h
! acksend.o: /usr/include/machine/machparam.h /usr/include/signal.h
! acksend.o: /usr/include/sys/types.h /usr/include/stdio.h
! acksend.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/errno.h
! acksend.o: /usr/include/syslog.h /usr/include/sys/socket.h
! acksend.o: /usr/include/netinet/in.h /usr/include/netdb.h
! acksend.o: /usr/include/arpa/inet.h /usr/include/protocols/timed.h
! candidate.o: candidate.c ./globals.h /usr/include/sys/param.h
! candidate.o: /usr/include/machine/machparam.h /usr/include/signal.h
! candidate.o: /usr/include/sys/types.h /usr/include/stdio.h
! candidate.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/errno.h
! candidate.o: /usr/include/syslog.h /usr/include/sys/socket.h
! candidate.o: /usr/include/netinet/in.h /usr/include/netdb.h
! candidate.o: /usr/include/arpa/inet.h /usr/include/protocols/timed.h
! correct.o: correct.c ./globals.h /usr/include/sys/param.h
! correct.o: /usr/include/machine/machparam.h /usr/include/signal.h
! correct.o: /usr/include/sys/types.h /usr/include/stdio.h
! correct.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/errno.h
! correct.o: /usr/include/syslog.h /usr/include/sys/socket.h
! correct.o: /usr/include/netinet/in.h /usr/include/netdb.h
! correct.o: /usr/include/arpa/inet.h /usr/include/protocols/timed.h
! master.o: master.c ./globals.h /usr/include/sys/param.h
! master.o: /usr/include/machine/machparam.h /usr/include/signal.h
! master.o: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/sys/time.h
! master.o: /usr/include/time.h /usr/include/errno.h /usr/include/syslog.h
! master.o: /usr/include/sys/socket.h /usr/include/netinet/in.h
! master.o: /usr/include/netdb.h /usr/include/arpa/inet.h
! master.o: /usr/include/protocols/timed.h /usr/include/setjmp.h
! networkdelta.o: networkdelta.c ./globals.h /usr/include/sys/param.h
! networkdelta.o: /usr/include/machine/machparam.h /usr/include/signal.h
! networkdelta.o: /usr/include/sys/types.h /usr/include/stdio.h
! networkdelta.o: /usr/include/sys/time.h /usr/include/time.h
! networkdelta.o: /usr/include/errno.h /usr/include/syslog.h
! networkdelta.o: /usr/include/sys/socket.h /usr/include/netinet/in.h
! networkdelta.o: /usr/include/netdb.h /usr/include/arpa/inet.h
! networkdelta.o: /usr/include/protocols/timed.h
! readmsg.o: readmsg.c ./globals.h /usr/include/sys/param.h
! readmsg.o: /usr/include/machine/machparam.h /usr/include/signal.h
! readmsg.o: /usr/include/sys/types.h /usr/include/stdio.h
! readmsg.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/errno.h
! readmsg.o: /usr/include/syslog.h /usr/include/sys/socket.h
! readmsg.o: /usr/include/netinet/in.h /usr/include/netdb.h
! readmsg.o: /usr/include/arpa/inet.h /usr/include/protocols/timed.h
! slave.o: slave.c ./globals.h /usr/include/sys/param.h
! slave.o: /usr/include/machine/machparam.h /usr/include/signal.h
! slave.o: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/sys/time.h
! slave.o: /usr/include/time.h /usr/include/errno.h /usr/include/syslog.h
! slave.o: /usr/include/sys/socket.h /usr/include/netinet/in.h
! slave.o: /usr/include/netdb.h /usr/include/arpa/inet.h
! slave.o: /usr/include/protocols/timed.h /usr/include/setjmp.h
! timed.o: timed.c ./globals.h /usr/include/sys/param.h
! timed.o: /usr/include/machine/machparam.h /usr/include/signal.h
! timed.o: /usr/include/sys/types.h /usr/include/stdio.h /usr/include/sys/time.h
! timed.o: /usr/include/time.h /usr/include/errno.h /usr/include/syslog.h
! timed.o: /usr/include/sys/socket.h /usr/include/netinet/in.h
! timed.o: /usr/include/netdb.h /usr/include/arpa/inet.h
! timed.o: /usr/include/protocols/timed.h /usr/include/net/if.h
! timed.o: /usr/include/sys/file.h /usr/include/sys/ioctl.h
! timed.o: /usr/include/sys/ttychars.h /usr/include/sys/ttydev.h
! timed.o: /usr/include/setjmp.h
! byteorder.o: byteorder.c ./globals.h /usr/include/sys/param.h
! byteorder.o: /usr/include/machine/machparam.h /usr/include/signal.h
! byteorder.o: /usr/include/sys/types.h /usr/include/stdio.h
! byteorder.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/errno.h
! byteorder.o: /usr/include/syslog.h /usr/include/sys/socket.h
! byteorder.o: /usr/include/netinet/in.h /usr/include/netdb.h
! byteorder.o: /usr/include/arpa/inet.h /usr/include/protocols/timed.h
! measure.o: measure.c ./globals.h /usr/include/sys/param.h
! measure.o: /usr/include/machine/machparam.h /usr/include/signal.h
! measure.o: /usr/include/sys/types.h /usr/include/stdio.h
! measure.o: /usr/include/sys/time.h /usr/include/time.h /usr/include/errno.h
! measure.o: /usr/include/syslog.h /usr/include/sys/socket.h
! measure.o: /usr/include/netinet/in.h /usr/include/netdb.h
! measure.o: /usr/include/arpa/inet.h /usr/include/protocols/timed.h
! measure.o: /usr/include/netinet/in_systm.h /usr/include/netinet/ip.h
! measure.o: /usr/include/netinet/ip_icmp.h
! cksum.o: vax/cksum.c /usr/include/sys/types.h
! # DEPENDENCIES MUST END AT END OF FILE
! # IF YOU PUT STUFF HERE IT WILL GO AWAY
! # see make depend above
--- 55,62 ----
  	lint ${SRCDS} ${COMMS}
  	lint ${SRCCS} ${COMMS}
  
! depend: ${SRCCS} ${SRCDS} ${COMMS}
! 	mkdep ${CFLAGS} ${SRCCS} ${SRCDS} ${COMMS}
  
! # DO NOT DELETE THIS LINE -- mkdep uses it.
! # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
*** /usr/src/usr.sbin/traceroute/Makefile.old	Sun Jan 28 18:35:07 1996
--- /usr/src/usr.sbin/traceroute/Makefile	Sun Dec  1 17:57:56 1996
***************
*** 1,5 ****
  #
! # traceroute Makefile.  Revised 1996/1/28
  #
  INCL =
  CFLAGS = -O -i
--- 1,5 ----
  #
! # traceroute Makefile.  Revised 1996/11/17
  #
  INCL =
  CFLAGS = -O -i
***************
*** 11,18 ****
  	cc $(CFLAGS) $(INCL) -o traceroute traceroute.o $(LIBS)
  
  install: traceroute traceroute.0
! 	install -s -o root -g bin -m 4551 traceroute ${DESTDIR}/etc/traceroute 
! 	install -c -m 444 -o bin -g bin traceroute.0 ${DESTDIR}/usr/new/man/cat8
  
  traceroute.0: traceroute.8
  	/usr/man/manroff traceroute.8 > traceroute.0
--- 11,18 ----
  	cc $(CFLAGS) $(INCL) -o traceroute traceroute.o $(LIBS)
  
  install: traceroute traceroute.0
! 	install -c -s -o root -g bin -m 4551 traceroute ${DESTDIR}/usr/sbin/traceroute 
! 	install -c -m 444 -o bin -g bin traceroute.0 ${DESTDIR}/usr/man/cat8
  
  traceroute.0: traceroute.8
  	/usr/man/manroff traceroute.8 > traceroute.0
*** /usr/src/usr.sbin/update/update.8.old	Sun Dec 14 15:08:44 1986
--- /usr/src/usr.sbin/update/update.8	Sun Nov 17 21:18:39 1996
***************
*** 1,11 ****
! .\"	@(#)update.8	6.1 (Berkeley) 4/27/85
  .\"
! .TH UPDATE 8 "April 27, 1985"
  .AT 3
  .SH NAME
  update \- periodically update the super block
  .SH SYNOPSIS
! .B /etc/update
  .SH DESCRIPTION
  .I Update
  is a program that executes
--- 1,11 ----
! .\"	@(#)update.8	6.1.1 (2.11BSD) 1996/11/17
  .\"
! .TH UPDATE 8 "November 17, 1996"
  .AT 3
  .SH NAME
  update \- periodically update the super block
  .SH SYNOPSIS
! .B update
  .SH DESCRIPTION
  .I Update
  is a program that executes
*** /usr/src/usr.sbin/vipw/Makefile.old	Sun Jan 28 19:51:05 1996
--- /usr/src/usr.sbin/vipw/Makefile	Sat Nov 16 21:57:57 1996
***************
*** 14,25 ****
  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
  # FITNESS FOR A PARTICULAR PURPOSE.
  #
! # @(#)Makefile	5.1.2 (2.11BSD) 1996/1/28
  #
  
  CFLAGS=	-O
  SEPFLAG= -i
- LIBC=	/lib/libc.a
  SRCS=	vipw.c
  OBJS=	vipw.o
  MAN=	vipw.0
--- 14,24 ----
  # WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND
  # FITNESS FOR A PARTICULAR PURPOSE.
  #
! # @(#)Makefile	5.1.3 (2.11BSD) 1996/11/16
  #
  
  CFLAGS=	-O
  SEPFLAG= -i
  SRCS=	vipw.c
  OBJS=	vipw.o
  MAN=	vipw.0
***************
*** 27,33 ****
  
  all: vipw ${MAN}
  
! vipw: ${LIBC} ${OBJS}
  	${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS}
  
  vipw.0: ${MANSRC}
--- 26,32 ----
  
  all: vipw ${MAN}
  
! vipw: ${OBJS}
  	${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS}
  
  vipw.0: ${MANSRC}
***************
*** 43,49 ****
  	mkdep ${CFLAGS} ${SRCS}
  
  install: ${MAN} vipw
! 	install -s -o bin -g bin -m 755 vipw ${DESTDIR}/etc
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
  
  lint: ${SRCS}
--- 42,48 ----
  	mkdep ${CFLAGS} ${SRCS}
  
  install: ${MAN} vipw
! 	install -s -o bin -g bin -m 755 vipw ${DESTDIR}/usr/sbin
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
  
  lint: ${SRCS}
*** /VERSION.old	Wed Nov 13 21:38:20 1996
--- /VERSION	Thu Dec  5 20:01:43 1996
***************
*** 1,4 ****
! Current Patch Level: 343
  
  2.11 BSD
  ============
--- 1,4 ----
! Current Patch Level: 351
  
  2.11 BSD
  ============
