Subject: The Grand Reorganization Continues (#347 - 4 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 #347 (part 4 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.

----------------------#347 Cut here-----------------------------
*** /usr/src/bin/passwd/Makefile.old	Sun Jan 28 19:57:08 1996
--- /usr/src/bin/passwd/Makefile	Sun Dec  1 14:46:20 1996
***************
*** 14,24 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4.1 (2.11BSD) 1996/1/27
  #
  CFLAGS=	-I. -O
  SEPFLAG= -i
- LIBC=	/lib/libc.a
  SRCS=	passwd.c
  OBJS=	passwd.o
  MAN=	passwd.0
--- 14,23 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	5.4.2 (2.11BSD) 1996/12/1
  #
  CFLAGS=	-I. -O
  SEPFLAG= -i
  SRCS=	passwd.c
  OBJS=	passwd.o
  MAN=	passwd.0
***************
*** 26,32 ****
  
  all: passwd ${MAN}
  
! passwd: ${LIBC} ${OBJS}
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS}
  
  ${MAN}: ${MANSRC}
--- 25,31 ----
  
  all: passwd ${MAN}
  
! passwd: ${OBJS}
  	${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS}
  
  ${MAN}: ${MANSRC}
*** /usr/src/bin/ping/Makefile.old	Sun Jan 28 19:57:39 1996
--- /usr/src/bin/ping/Makefile	Sat Nov 16 20:47:19 1996
***************
*** 4,10 ****
  
  CFLAGS=	-O
  SEPFLAG= -i
- LIBC=	/lib/libc.a
  SRCS=	ping.c
  OBJS=	ping.o
  MAN=	ping.0
--- 4,9 ----
***************
*** 12,18 ****
  
  all: ping ${MAN}
  
! ping: ${LIBC} ${OBJS}
  	${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS}
  
  ping.0: ${MANSRC}
--- 11,17 ----
  
  all: ping ${MAN}
  
! ping: ${OBJS}
  	${CC} ${SEPFLAG} -o $@ ${CFLAGS} ${OBJS}
  
  ping.0: ${MANSRC}
***************
*** 28,34 ****
  	mkdep ${CFLAGS} ${SRCS}
  
  install: ${MAN} ping
! 	install -s -o root -g bin -m 4751 ping ${DESTDIR}/etc
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
  
  lint: ${SRCS}
--- 27,33 ----
  	mkdep ${CFLAGS} ${SRCS}
  
  install: ${MAN} ping
! 	install -s -o root -g bin -m 4751 ping ${DESTDIR}/bin
  	install -c -o bin -g bin -m 444 ${MAN} ${DESTDIR}/usr/man/cat8
  
  lint: ${SRCS}
*** /usr/src/bin/ps.c.old	Tue Dec 20 16:06:17 1994
--- /usr/src/bin/ps.c	Sat Nov 16 17:59:56 1996
***************
*** 1,4 ****
--- 1,6 ----
  /*
+  *	1996/11/16 - Move 'psdatabase' in /var/run.
+  *
   *	12/20/94 - Missing casts caused errors in reporting on swapped
   *		   processes - sms
   *	1/7/93 - Heavily revised when the symbol table format changed - sms
***************
*** 59,69 ****
  	int	nproc;
  	int	nchans;
  	int	nttys;
! #ifndef	PSFILE
! 	char	*psdb	= "/etc/psdatabase";
! #else
! 	char	*psdb	= PSFILE;
! #endif
  	int	npr;			/* number of processes found so far */
  	int	twidth;			/* terminal width */
  	int	cmdstart;		/* start position for command field */
--- 61,67 ----
  	int	nproc;
  	int	nchans;
  	int	nttys;
! 	char	*psdb	= "/var/run/psdatabase";
  	int	npr;			/* number of processes found so far */
  	int	twidth;			/* terminal width */
  	int	cmdstart;		/* start position for command field */
***************
*** 497,503 ****
  		/*
  		 * If we want names, traverse the password file. For each
  		 * passwd entry, look for it in the processes.
! 		 * In case of multiple entries in /etc/passwd, we believe
  		 * the first one (same thing ls does).
  		 */
  		while ((pw = getpwent()) != (struct passwd *) NULL) {
--- 495,501 ----
  		/*
  		 * If we want names, traverse the password file. For each
  		 * passwd entry, look for it in the processes.
! 		 * In case of multiple entries in the password file we believe
  		 * the first one (same thing ls does).
  		 */
  		while ((pw = getpwent()) != (struct passwd *) NULL) {
*** /usr/src/bin/wall.c.old	Fri Dec 31 22:01:42 1993
--- /usr/src/bin/wall.c	Sat Nov 16 18:03:38 1996
***************
*** 9,15 ****
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)wall.c	5.3.1 (2.11BSD GTE) 12/31/93";
  #endif
  
  /*
--- 9,15 ----
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)wall.c	5.3.2 (2.11BSD GTE) 1996/11/16";
  #endif
  
  /*
***************
*** 53,60 ****
  	struct stat statb;
  
  	(void) gethostname(hostname, sizeof (hostname));
! 	if ((f = open("/etc/utmp", O_RDONLY, 0)) < 0) {
! 		fprintf(stderr, "Cannot open /etc/utmp\n");
  		exit(1);
  	}
  	clock = time( 0 );
--- 53,60 ----
  	struct stat statb;
  
  	(void) gethostname(hostname, sizeof (hostname));
! 	if ((f = open(_PATH_UTMP, O_RDONLY, 0)) < 0) {
! 		fprintf(stderr, "Cannot open %s\n", _PATH_UTMP);
  		exit(1);
  	}
  	clock = time( 0 );
*** /usr/src/bin/who.c.old	Mon Jan 10 21:40:29 1994
--- /usr/src/bin/who.c	Sat Nov 16 18:06:48 1996
***************
*** 9,25 ****
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)who.c	5.1.1 (2.11BSD GTE) 12/31/93";
  #endif
  
- /*
-  * who
-  */
- 
  #include <stdio.h>
  #include <utmp.h>
  #include <pwd.h>
  #include <ctype.h>
  
  #define NMAX sizeof(utmp.ut_name)
  #define LMAX sizeof(utmp.ut_line)
--- 9,22 ----
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)who.c	5.1.2 (2.11BSD GTE) 1996/11/16";
  #endif
  
  #include <stdio.h>
  #include <utmp.h>
  #include <pwd.h>
  #include <ctype.h>
+ #include <sys/param.h>	/* for MAXHOSTNAMELEN */
  
  #define NMAX sizeof(utmp.ut_name)
  #define LMAX sizeof(utmp.ut_line)
***************
*** 28,34 ****
  struct	utmp utmp;
  struct	passwd *pw;
  struct	passwd *getpwuid();
! char	hostname[32];
  
  char	*ttyname(), *rindex(), *ctime(), *strcpy();
  
--- 25,31 ----
  struct	utmp utmp;
  struct	passwd *pw;
  struct	passwd *getpwuid();
! char	hostname[MAXHOSTNAMELEN];
  
  char	*ttyname(), *rindex(), *ctime(), *strcpy();
  
***************
*** 41,47 ****
  	extern char _sobuf[];
  
  	setbuf(stdout, _sobuf);
! 	s = "/etc/utmp";
  	if(argc == 2)
  		s = argv[1];
  	if (argc == 3) {
--- 38,44 ----
  	extern char _sobuf[];
  
  	setbuf(stdout, _sobuf);
! 	s = _PATH_UTMP;
  	if(argc == 2)
  		s = argv[1];
  	if (argc == 3) {
***************
*** 58,64 ****
  		}
  	}
  	if ((fi = fopen(s, "r")) == NULL) {
! 		puts("who: cannot open utmp");
  		exit(1);
  	}
  	while (fread((char *)&utmp, sizeof(utmp), 1, fi) == 1) {
--- 55,61 ----
  		}
  	}
  	if ((fi = fopen(s, "r")) == NULL) {
! 		fprintf(stderr, "who: cannot open %s", s);
  		exit(1);
  	}
  	while (fread((char *)&utmp, sizeof(utmp), 1, fi) == 1) {
*** /usr/src/bin/write.c.old	Fri Dec 31 21:59:56 1993
--- /usr/src/bin/write.c	Sat Nov 16 18:32:28 1996
***************
*** 1,5 ****
! #ifndef	lint
! static char *sccsid = "@(#)write.c	4.13.1 12/31/93";
  #endif
  /*
   * write to another user
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char *sccsid = "@(#)write.c	4.13.2 1996/11/16";
  #endif
  /*
   * write to another user
***************
*** 11,23 ****
  #include <sys/stat.h>
  #include <signal.h>
  #include <utmp.h>
! #include <sys/time.h>
  
  #define	NMAX	sizeof(ubuf.ut_name)
  #define	LMAX	sizeof(ubuf.ut_line)
  
- char	*strcat();
- char	*strcpy();
  struct	utmp ubuf;
  int	signum[] = {SIGHUP, SIGINT, SIGQUIT, 0};
  char	me[NMAX + 1]	= "???";
--- 11,25 ----
  #include <sys/stat.h>
  #include <signal.h>
  #include <utmp.h>
! #include <errno.h>
! #include <string.h>
! #include <unistd.h>
! #include <stdlib.h>
! #include <time.h>
  
  #define	NMAX	sizeof(ubuf.ut_name)
  #define	LMAX	sizeof(ubuf.ut_line)
  
  struct	utmp ubuf;
  int	signum[] = {SIGHUP, SIGINT, SIGQUIT, 0};
  char	me[NMAX + 1]	= "???";
***************
*** 26,39 ****
  char	histty[32];
  char	ttybuf[32];
  char	*histtya;
- char	*ttyname();
- char	*rindex();
  int	logcnt;
  int	eof();
  int	timout();
  FILE	*tf;
- char	*getenv();
- time_t	time();
  
  main(argc, argv)
  	int argc;
--- 28,37 ----
***************
*** 43,52 ****
  	register i;
  	register FILE *uf;
  	int c1, c2;
! 	long clock = time(0);
  	int suser = getuid() == 0;
  	int nomesg = 0;
- 	struct tm *localtime();
  	struct tm *localclock = localtime( &clock );
  
  	if (argc < 2) {
--- 41,49 ----
  	register i;
  	register FILE *uf;
  	int c1, c2;
! 	time_t clock = time(0);
  	int suser = getuid() == 0;
  	int nomesg = 0;
  	struct tm *localclock = localtime( &clock );
  
  	if (argc < 2) {
***************
*** 56,63 ****
  	him = argv[1];
  	if (argc > 2)
  		histtya = argv[2];
! 	if ((uf = fopen("/etc/utmp", "r")) == NULL) {
! 		perror("write: Can't open /etc/utmp");
  		if (histtya == 0)
  			exit(10);
  		goto cont;
--- 53,60 ----
  	him = argv[1];
  	if (argc > 2)
  		histtya = argv[2];
! 	if ((uf = fopen(_PATH_UTMP, "r")) == NULL) {
! 		fprintf(stderr, "write: %s: %s\n", _PATH_UTMP, strerror(errno));
  		if (histtya == 0)
  			exit(10);
  		goto cont;
*** /usr/src/etc/Makefile.old	Wed Nov 13 21:49:44 1996
--- /usr/src/etc/Makefile	Sat Nov 30 10:52:56 1996
***************
*** 3,115 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.14.8 (2.11BSD GTE) 1996/11/13
  #
  DESTDIR=
  CFLAGS=	-O
  SEPFLAG= -i
  
- # Programs that live in subdirectories, and have makefiles of their own.
- #
- SUBDIR=	chroot config dev_mkdb dump fingerd fsck ftpd getty htable implog \
- 	named restor routed talkd tftpd timed tzone \
- 	mkpasswd mount ping quotacheck vipw rlogind rshd tcpd umount
- 
- # Shell scripts that need only be installed and are never removed.
- #
- SCRIPT= mklost+found
- 
  # C programs that live in the current directory and do not need
  # explicit make lines.
  #
! STD=	ac accton arff bad144 badsect catman chown clri comsat \
! 	cron dcheck diskpart dumpfs edquota flcopy \
! 	gettable ifconfig icheck init newfs mkfs mknod \
! 	mkproto ncheck quotaon reboot renice \
! 	repquota rexecd rmt route rwhod rxformat sa savecore \
! 	shutdown slattach swapon syslogd telnetd tunefs update
  
! # C programs that live in the current directory and need explicit make lines.
! #
! NSTD=
  
! # Programs that must run setuid to root
! #
! SETUID=
! 
! # C programs that must run set-group-id kmem.
! #
! KMEM=	fstat pstat arp dmesg kgmon trpt
! 
! # C programs that must run set-group-id operator.
! #
! OPERATOR= quot
! 
! # optional: not always made
! OPTIONAL= mkhosts
! 
! all:	${SUBDIR} ${STD} ${NSTD} ${OPTIONAL} ${KMEM} ${SETUID} ${OPERATOR}
! 
! ${SUBDIR}: FRC
! 	cd $@; make ${MFLAGS} SEPFLAG=${SEPFLAG}
! 
! ${STD} ${KMEM} ${SETUID} ${OPERATOR}:
  	cc ${CFLAGS} ${SEPFLAG} -o $@ $@.c
  
! install: ${STD} ${NSTD} ${SETUID} ${KMEM}  ${OPERATOR}
! 	-for i in ${SUBDIR}; do \
! 		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
! 	-for i in ${SCRIPT}; do (install -c $$i.sh ${DESTDIR}/etc/$$i); done
! 	install -s ${STD} ${NSTD} ${DESTDIR}/etc
! 	-for i in ${OPTIONAL}; do \
! 		(if [ -f $$i ]; then install -s $$i ${DESTDIR}/etc; fi); done
! 	-for i in ${SETUID} x; do \
! 		(if [ $$i != "x" ]; then install -o root -m 4755 -s $$i \
! 					${DESTDIR}/etc/$$i; fi); done
! 	-for i in ${KMEM}; do \
! 		(install -g kmem -m 2755 -s $$i ${DESTDIR}/etc/$$i); done
! 	-for i in ${OPERATOR}; do \
! 		(install -g operator -m 2755 -s $$i ${DESTDIR}/etc/$$i); done
! 	-chown root.operator ${DESTDIR}/etc/shutdown
! 	-chmod 4750 ${DESTDIR}/etc/shutdown
! 	-rm -f ${DESTDIR}/etc/quotaoff
! 	-ln ${DESTDIR}/etc/quotaon ${DESTDIR}/etc/quotaoff
! 	-rm -f ${DESTDIR}/etc/fastboot ${DESTDIR}/etc/halt
! 	-ln ${DESTDIR}/etc/reboot ${DESTDIR}/etc/fastboot
! 	-ln ${DESTDIR}/etc/reboot ${DESTDIR}/etc/halt
! 	-mkdir ${DESTDIR}/usr/spool/rwho
  	-chmod 755 ${DESTDIR}/etc/init
  
  clean:
  	-rm -f a.out core *.s *.o
! 	-for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
! 	-rm -f ${STD} ${NSTD} ${KMEM} ${SETUID} ${OPERATOR} ${OPTIONAL}
  
  FRC:
  
  depend:
- 	for i in ${STD} ${NSTD} ${KMEM} ${SETUID}; do \
- 	    cc -M ${INCPATH} $$i.c | sed 's/\.o//' | \
- 	    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; 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
- 
- # Files listed in ${NSTD} and ${OPTIONAL} have explicit make lines given below.
- 
- mkhosts:
- 	@echo "Mkhosts only works with the dbm version of the hostent routines."
- 	@echo "If gethosts() is not in libc, mkhosts isn't installed."
- 	-cc ${CFLAGS} -o mkhosts mkhosts.c || rm mkhosts
- 
- # DO NOT DELETE THIS LINE -- make depend uses it
- 
--- 3,32 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.14.9 (2.11BSD GTE) 1996/11/16
  #
  DESTDIR=
  CFLAGS=	-O
  SEPFLAG= -i
  
  # C programs that live in the current directory and do not need
  # explicit make lines.
  #
! STD=	init
  
! all:	${STD}
  
! ${STD}:
  	cc ${CFLAGS} ${SEPFLAG} -o $@ $@.c
  
! install: ${STD}
! 	install -s ${STD} ${DESTDIR}/etc
  	-chmod 755 ${DESTDIR}/etc/init
  
  clean:
  	-rm -f a.out core *.s *.o
! 	-rm -f ${STD}
  
  FRC:
  
  depend:
*** /usr/src/games/atc/Makefile.old	Thu Jun  9 20:05:46 1988
--- /usr/src/games/atc/Makefile	Sun Dec  1 14:47:04 1996
***************
*** 3,14 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.1	(Berkeley)	12/12/87
  #
  
  CFLAGS=	-O -DBSD -DDEST=\"${DESTDIR}/usr/games/lib/atc/\"
  YFLAGS=	-d
- LIBC=	/lib/libc.a
  LIBS=	-ll -lm -lcurses -ltermcap
  SRCS=	extern.c grammar.c graphics.c input.c lex.c list.c log.c \
  	main.c tunable.c update.c
--- 3,14 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.1.1	(2.11BSD)	1996/12/1
  #
  
+ DESTDIR=
  CFLAGS=	-O -DBSD -DDEST=\"${DESTDIR}/usr/games/lib/atc/\"
  YFLAGS=	-d
  LIBS=	-ll -lm -lcurses -ltermcap
  SRCS=	extern.c grammar.c graphics.c input.c lex.c list.c log.c \
  	main.c tunable.c update.c
***************
*** 17,23 ****
  
  all: atc
  
! atc: ${OBJS} ${LIBC}
  	${CC} ${CFLAGS} ${OBJS} ${LIBS} -o $@
  
  clean: FRC
--- 17,23 ----
  
  all: atc
  
! atc: ${OBJS}
  	${CC} ${CFLAGS} ${OBJS} ${LIBS} -o $@
  
  clean: FRC
*** /usr/src/games/phantasia/main.c.old	Tue May 20 11:24:24 1986
--- /usr/src/games/phantasia/main.c	Sat Nov 16 22:04:38 1996
***************
*** 570,576 ****
  		|| (tp->tm_hour > 13 && tp->tm_hour < 16))		/* 1-4 pm */
  		return (FALSE);
  	/* check # of users */
! 	fp = fopen("/etc/utmp","r");
  	while (fread((char *) &ubuf,sizeof(ubuf),1,fp))
  #ifdef	USG5
  		if (ubuf.ut_type == USER_PROCESS)
--- 570,576 ----
  		|| (tp->tm_hour > 13 && tp->tm_hour < 16))		/* 1-4 pm */
  		return (FALSE);
  	/* check # of users */
! 	fp = fopen(_PATH_UTMP,"r");
  	while (fread((char *) &ubuf,sizeof(ubuf),1,fp))
  #ifdef	USG5
  		if (ubuf.ut_type == USER_PROCESS)
*** /usr/src/games/rogue/Makefile.old	Mon Jan 18 08:56:18 1993
--- /usr/src/games/rogue/Makefile	Sun Dec  1 14:47:29 1996
***************
*** 9,18 ****
  # software without specific written prior permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	@(#)Makefile	5.3 (Berkeley) 1/13/88
  #
  CFLAGS=	-O -DUNIX -DUNIX_BSD4_2
- LIBC=	/lib/libc.a
  SRCS=	curses.c	\
  	hit.c		\
  	init.c		\
--- 9,17 ----
  # software without specific written prior permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	@(#)Makefile	5.3.1 (2.11BSD) 1996/12/1
  #
  CFLAGS=	-O -DUNIX -DUNIX_BSD4_2
  SRCS=	curses.c	\
  	hit.c		\
  	init.c		\
***************
*** 62,68 ****
  
  all: rogue
  
! rogue: ${OBJS} ${LIBC}
  	${CC} -i ${OBJS} -o $@ -lcurses -ltermlib
  
  clean: FRC
--- 61,67 ----
  
  all: rogue
  
! rogue: ${OBJS}
  	${CC} -i ${OBJS} -o $@ -lcurses -ltermlib
  
  clean: FRC
*** /usr/src/include/paths.h.old	Mon Oct 21 19:50:59 1996
--- /usr/src/include/paths.h	Wed Nov 27 20:11:50 1996
***************
*** 14,20 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3.6 (2.11BSD) 1996/10/21
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
--- 14,20 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.3.7 (2.11BSD) 1996/11/27
   */
  
  #define	_PATH_BSHELL	"/bin/sh"
***************
*** 26,31 ****
--- 26,32 ----
  #define	_PATH_DEVNULL	"/dev/null"
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_DEV	"/dev"
+ #define	_PATH_NOLOGIN	"/etc/nologin"
  #define	_PATH_LASTLOG	"/usr/adm/lastlog"
  #define	_PATH_TMP	"/tmp/"
  #define	_PATH_VARTMP	"/usr/tmp/"
*** /usr/src/include/sysexits.h.old	Fri Sep 16 22:51:54 1988
--- /usr/src/include/sysexits.h	Fri Nov 29 20:12:18 1996
***************
*** 9,15 ****
   * software without specific prior written permission. This software
   * is provided ``as is'' without express or implied warranty.
   *
!  *	@(#)sysexits.h	4.4 (Berkeley) 3/24/88
   */
  
  /*
--- 9,15 ----
   * software without specific prior written permission. This software
   * is provided ``as is'' without express or implied warranty.
   *
!  *	@(#)sysexits.h	4.4.1 (2.11BSD) 1996/11/29
   */
  
  /*
***************
*** 51,57 ****
  **		fork", "cannot create pipe", or the like.  It includes
  **		things like getuid returning a user that does not
  **		exist in the passwd file.
! **	EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
  **		etc.) does not exist, cannot be opened, or has some
  **		sort of error (e.g., syntax error).
  **	EX_CANTCREAT -- A (user specified) output file cannot be
--- 51,57 ----
  **		fork", "cannot create pipe", or the like.  It includes
  **		things like getuid returning a user that does not
  **		exist in the passwd file.
! **	EX_OSFILE -- Some system file (e.g., /etc/passwd, /var/run/utmp,
  **		etc.) does not exist, cannot be opened, or has some
  **		sort of error (e.g., syntax error).
  **	EX_CANTCREAT -- A (user specified) output file cannot be
*** /usr/src/include/tzfile.h.old	Mon Mar 30 17:57:20 1987
--- /usr/src/include/tzfile.h	Fri Nov 29 20:14:25 1996
***************
*** 1,5 ****
  /*
!  *	@(#)tzfile.h	5.2 tzfile.h 3/4/87
   */
  
  /*
--- 1,5 ----
  /*
!  *	@(#)tzfile.h	5.2.1 (2.11BSD) 1996/11/29
   */
  
  /*
***************
*** 6,13 ****
  ** Information about time zone files.
  */
  
! #define	TZDIR		"/etc/zoneinfo"	/* Time zone object file directory */
! #define	TZDEFAULT	"localtime"
  
  /*
  ** Each file begins with. . .
--- 6,14 ----
  ** Information about time zone files.
  */
  
! 			/* Time zone object file directory */
! #define	TZDIR		"/usr/share/zoneinfo"
! #define	TZDEFAULT	"/etc/localtime"
  
  /*
  ** Each file begins with. . .
*** /usr/src/include/utmp.h.old	Sun May  9 16:24:46 1993
--- /usr/src/include/utmp.h	Wed Nov 27 20:12:57 1996
***************
*** 14,23 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)utmp.h	5.6 (2.11BSD) 5/9/93
   */
  
! #define	_PATH_UTMP	"/etc/utmp"
  #define	_PATH_WTMP	"/usr/adm/wtmp"
  
  #define	UT_NAMESIZE	15
--- 14,23 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)utmp.h	5.6.1 (2.11BSD) 1996/11/27
   */
  
! #define	_PATH_UTMP	"/var/run/utmp"
  #define	_PATH_WTMP	"/usr/adm/wtmp"
  
  #define	UT_NAMESIZE	15
*** /usr/src/lib/libc/gen/getlogin.c.old	Fri May  9 16:14:20 1986
--- /usr/src/lib/libc/gen/getlogin.c	Sat Nov 16 22:06:42 1996
***************
*** 1,10 ****
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)getlogin.c	5.3 (Berkeley) 5/9/86";
  #endif LIBC_SCCS and not lint
  
  #include <utmp.h>
  
! static	char UTMP[]	= "/etc/utmp";
  static	struct utmp ubuf;
  
  char *
--- 1,10 ----
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)getlogin.c	5.3.1 (2.11BSD) 1996/11/16";
  #endif LIBC_SCCS and not lint
  
  #include <utmp.h>
  
! static	char UTMP[]	= _PATH_UTMP;
  static	struct utmp ubuf;
  
  char *
*** /usr/src/lib/libc/gen/sysctl.c.old	Mon Jan 16 22:47:13 1995
--- /usr/src/lib/libc/gen/sysctl.c	Wed Nov 27 20:19:07 1996
***************
*** 32,38 ****
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)sysctl.c	8.2.1 (2.11BSD GTE) 1/7/95";
  #endif /* LIBC_SCCS and not lint */
  
  #include <sys/param.h>
--- 32,38 ----
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)sysctl.c	8.2.2 (2.11BSD GTE) 1996/11/27";
  #endif /* LIBC_SCCS and not lint */
  
  #include <sys/param.h>
***************
*** 42,48 ****
  
  extern	int	errno;
  static 
! char _PATH_STDPATH[]="/usr/bin:/bin:/usr/ucb:/usr/local:/usr/new:/etc";
  
  
  int
--- 42,48 ----
  
  extern	int	errno;
  static 
! char _PATH_STDPATH[]="/usr/bin:/bin:/usr/ucb:/sbin:/usr/sbin:/usr/local:/usr/new";
  
  
  int
*** /usr/src/lib/libc/gen/timezone.c.old	Mon Mar 30 16:56:46 1987
--- /usr/src/lib/libc/gen/timezone.c	Wed Nov 27 20:22:03 1996
***************
*** 5,13 ****
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)timezone.c	1.1 (Berkeley) 3/25/87";
  #endif LIBC_SCCS and not lint
  
  #include <sys/types.h>
  #include <sys/time.h>
  #include <stdio.h>
--- 5,15 ----
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)timezone.c	1.2 (2.11BSD) 1996/11/27";
  #endif LIBC_SCCS and not lint
  
+ #include <string.h>
+ #include <stdlib.h>
  #include <sys/types.h>
  #include <sys/time.h>
  #include <stdio.h>
***************
*** 30,36 ****
  {
  	register char	*beg,
  			*end;
! 	char	*getenv(), *index(), *strncpy(), *tztab();
  
  	if (beg = getenv("TZNAME")) {		/* set in environment */
  		if (end = index(beg, ',')) {	/* "PST,PDT" */
--- 32,38 ----
  {
  	register char	*beg,
  			*end;
! 	char	*tztab();
  
  	if (beg = getenv("TZNAME")) {		/* set in environment */
  		if (end = index(beg, ',')) {	/* "PST,PDT" */
***************
*** 74,81 ****
   * tztab --
   *	check static tables or create a new zone name; broken out so that
   *	we can make a guess as to what the zone is if the standard tables
!  *	aren't in place in /etc.  DO NOT USE THIS ROUTINE OUTSIDE OF THE
!  *	STANDARD LIBRARY.
   */
  char *
  tztab(zone,dst)
--- 76,83 ----
   * tztab --
   *	check static tables or create a new zone name; broken out so that
   *	we can make a guess as to what the zone is if the standard tables
!  *	aren't in place in /usr/share/misc.  DO NOT USE THIS ROUTINE OUTSIDE 
!  *	OF THE STANDARD LIBRARY.
   */
  char *
  tztab(zone,dst)
*** /usr/src/lib/libc/net/ruserpass.c.old	Sun Mar  9 20:28:21 1986
--- /usr/src/lib/libc/net/ruserpass.c	Sat Nov 16 22:10:11 1996
***************
*** 5,11 ****
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)ruserpass.c	5.2 (Berkeley) 3/9/86";
  #endif LIBC_SCCS and not lint
  
  #include <stdio.h>
--- 5,11 ----
   */
  
  #if defined(LIBC_SCCS) && !defined(lint)
! static char sccsid[] = "@(#)ruserpass.c	5.2.1 (2.11BSD) 1996/11/16";
  #endif LIBC_SCCS and not lint
  
  #include <stdio.h>
***************
*** 14,21 ****
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <errno.h>
  
! char	*renvlook(), *malloc(), *index(), *getenv(), *getpass(), *getlogin();
  struct	utmp *getutmp();
  static	FILE *cfile;
  
--- 14,24 ----
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <errno.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
  
! char	*renvlook();
  struct	utmp *getutmp();
  static	FILE *cfile;
  
***************
*** 28,34 ****
  		rnetrc(host, aname, apass);
  	if (*aname == 0) {
  		char *myname = getlogin();
! 		*aname = malloc(16);
  		printf("Name (%s:%s): ", host, myname);
  		fflush(stdout);
  		if (read(2, *aname, 16) <= 0)
--- 31,37 ----
  		rnetrc(host, aname, apass);
  	if (*aname == 0) {
  		char *myname = getlogin();
! 		*aname = (char *)malloc(16);
  		printf("Name (%s:%s): ", host, myname);
  		fflush(stdout);
  		if (read(2, *aname, 16) <= 0)
***************
*** 62,76 ****
  	if (comma == 0)
  		return;
  	if (*aname == 0) {
! 		*aname = malloc(comma - cp + 1);
  		strncpy(*aname, cp, comma - cp);
  	} else
  		if (strncmp(*aname, cp, comma - cp))
  			return;
  	comma++;
! 	cp = malloc(strlen(comma)+1);
  	strcpy(cp, comma);
! 	*apass = malloc(16);
  	mkpwclear(cp, host[0], *apass);
  }
  
--- 65,79 ----
  	if (comma == 0)
  		return;
  	if (*aname == 0) {
! 		*aname = (char *)malloc(comma - cp + 1);
  		strncpy(*aname, cp, comma - cp);
  	} else
  		if (strncmp(*aname, cp, comma - cp))
  			return;
  	comma++;
! 	cp = (char *)malloc(strlen(comma)+1);
  	strcpy(cp, comma);
! 	*apass = (char *)malloc(16);
  	mkpwclear(cp, host[0], *apass);
  }
  
***************
*** 162,168 ****
  		case LOGIN:
  			if (token())
  				if (*aname == 0) { 
! 					*aname = malloc(strlen(tokval) + 1);
  					strcpy(*aname, tokval);
  				} else {
  					if (strcmp(*aname, tokval))
--- 165,171 ----
  		case LOGIN:
  			if (token())
  				if (*aname == 0) { 
! 					*aname = (char *)malloc(strlen(tokval) + 1);
  					strcpy(*aname, tokval);
  				} else {
  					if (strcmp(*aname, tokval))
***************
*** 177,183 ****
  				exit(1);
  			}
  			if (token() && *apass == 0) {
! 				*apass = malloc(strlen(tokval) + 1);
  				strcpy(*apass, tokval);
  			}
  			break;
--- 180,186 ----
  				exit(1);
  			}
  			if (token() && *apass == 0) {
! 				*apass = (char *)malloc(strlen(tokval) + 1);
  				strcpy(*apass, tokval);
  			}
  			break;
***************
*** 716,722 ****
  
  	if(sttyname == NULL || sttyname[0] == 0)return(NULL);
  
! 	fdutmp = fopen("/etc/utmp","r");
  	if(fdutmp == NULL)return(NULL);
  
  	while(fread(&utmpstr,1,sizeof utmpstr,fdutmp) == sizeof utmpstr)
--- 719,725 ----
  
  	if(sttyname == NULL || sttyname[0] == 0)return(NULL);
  
! 	fdutmp = fopen(_PATH_UTMP,"r");
  	if(fdutmp == NULL)return(NULL);
  
  	while(fread(&utmpstr,1,sizeof utmpstr,fdutmp) == sizeof utmpstr)
*** /usr/src/libexec/Makefile.old	Thu Oct 24 21:16:39 1996
--- /usr/src/libexec/Makefile	Wed Nov 27 20:28:10 1996
***************
*** 1,7 ****
  #
  # Steven Schultz - put in the public domain 1996/6/25.
  #
! #	@(#)Makefile	1.1 (2.11BSD) 1996/10/24
  #
  DESTDIR=
  CFLAGS=	-O
--- 1,7 ----
  #
  # Steven Schultz - put in the public domain 1996/6/25.
  #
! #	@(#)Makefile	1.2 (2.11BSD) 1996/11/27
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 8,14 ****
  SEPFLAG= -i
  TAGSFILE=tags
  
! SUBDIR=	ctimed getNAME makekey
  
  all:	${SUBDIR}
  
--- 8,15 ----
  SEPFLAG= -i
  TAGSFILE=tags
  
! SUBDIR=	comsat ctimed fingerd ftpd getNAME getty makekey popper rexecd \
! 	rlogind rshd talkd tcpd telnetd tftpd
  
  all:	${SUBDIR}
  
*** /usr/src/libexec/comsat/comsat.8.old	Sun Dec 14 15:08:45 1986
--- /usr/src/libexec/comsat/comsat.8	Wed Nov 27 20:25:08 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)comsat.8c	6.2 (Berkeley) 5/20/86
  .\"
! .TH COMSAT 8C "May 20, 1986"
  .UC 5
  .SH NAME
  comsat \- biff server
  .SH SYNOPSIS
! .B /etc/comsat
  .SH DESCRIPTION
  .I Comsat
  is the server process which receives reports of incoming mail
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)comsat.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH COMSAT 8 "November 16, 1996"
  .UC 5
  .SH NAME
  comsat \- biff server
  .SH SYNOPSIS
! .B /usr/libexec/comsat
  .SH DESCRIPTION
  .I Comsat
  is the server process which receives reports of incoming mail
***************
*** 37,43 ****
  or ``Subject'' lines are not included in the displayed message.
  .SH FILES
  .DT
! /etc/utmp	to find out who's logged on and on what terminals
  .SH "SEE ALSO"
  biff(1), inetd(8)
  .SH BUGS
--- 37,43 ----
  or ``Subject'' lines are not included in the displayed message.
  .SH FILES
  .DT
! /var/run/utmp	to find out who's logged on and on what terminals
  .SH "SEE ALSO"
  biff(1), inetd(8)
  .SH BUGS
*** /usr/src/libexec/ftpd/ftpd.8.old	Thu Mar  2 09:39:18 1989
--- /usr/src/libexec/ftpd/ftpd.8	Sat Nov 16 19:46:01 1996
***************
*** 13,19 ****
  .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  .\"
! .\"	@(#)ftpd.8	6.7 (Berkeley) 2/28/89
  .\"
  .TH FTPD 8 "February 23, 1989"
  .UC 5
--- 13,19 ----
  .\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  .\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  .\"
! .\"	@(#)ftpd.8	6.7.1 (2.11BSD) 1996/11/16
  .\"
  .TH FTPD 8 "February 23, 1989"
  .UC 5
***************
*** 20,26 ****
  .SH NAME
  ftpd \- DARPA Internet File Transfer Protocol server
  .SH SYNOPSIS
! .B /etc/ftpd
  [
  .B \-d
  ] [
--- 20,26 ----
  .SH NAME
  ftpd \- DARPA Internet File Transfer Protocol server
  .SH SYNOPSIS
! .B /usr/libexec/ftpd
  [
  .B \-d
  ] [
*** /usr/src/libexec/getty/Makefile.old	Thu May 10 15:22:55 1990
--- /usr/src/libexec/getty/Makefile	Sat Nov 16 16:30:23 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.1 (Berkeley) 4/29/85
  #
  DESTDIR=
  CFLAGS=	-O
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.1.1 (2.11BSD) 1996/11/16
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 17,23 ****
  	${CC} ${SEPFLAG} -o getty ${OBJS}
  
  install: all gettytab
! 	install -s getty ${DESTDIR}/etc/getty
  	-install -c -m 444 gettytab ${DESTDIR}/etc/gettytab
  
  clean:
--- 17,23 ----
  	${CC} ${SEPFLAG} -o getty ${OBJS}
  
  install: all gettytab
! 	install -s getty ${DESTDIR}/usr/libexec/getty
  	-install -c -m 444 gettytab ${DESTDIR}/etc/gettytab
  
  clean:
*** /usr/src/libexec/popper/Makefile.old	Sun Jan 28 17:03:12 1996
--- /usr/src/libexec/popper/Makefile	Wed Nov 27 20:31:56 1996
***************
*** 1,4 ****
! #@(#)@(#)Makefile	2.6 1996/1/28
  
  DESTDIR		=
  CSRCS		=	pop_dele.c pop_dropcopy.c pop_dropinfo.c \
--- 1,4 ----
! #@(#)@(#)Makefile	2.6.1 1996/11/27
  
  DESTDIR		=
  CSRCS		=	pop_dele.c pop_dropcopy.c pop_dropinfo.c \
***************
*** 35,44 ****
  CFLAGS		=	-O -DBIND43
  TARGET		=	popper
  TAR		=	${TARGET}.tar
! INSTALLDIR	=	${DESTDIR}/usr/local
  MANPAGE		=	popper.8
  CATPAGE		=	popper.0
! MANDIR		=	${DESTDIR}/usr/local/man/cat8
  
  all: ${TARGET} ${CATPAGE}
  
--- 35,44 ----
  CFLAGS		=	-O -DBIND43
  TARGET		=	popper
  TAR		=	${TARGET}.tar
! INSTALLDIR	=	${DESTDIR}/usr/libexec
  MANPAGE		=	popper.8
  CATPAGE		=	popper.0
! MANDIR		=	${DESTDIR}/usr/man/cat8
  
  all: ${TARGET} ${CATPAGE}
  
*** /usr/src/libexec/popper/README.old	Wed Apr  3 15:25:44 1991
--- /usr/src/libexec/popper/README	Fri Nov 29 20:30:03 1996
***************
*** 1,4 ****
! @(#)@(#)README	2.6   2.6 4/2/91
  
  
  The Post Office Protocol Server:  Installation Guide
--- 1,4 ----
! @(#)@(#)README	2.7   1996/11/29
  
  
  The Post Office Protocol Server:  Installation Guide
***************
*** 173,179 ****
      source.
  
  4.  Issue the make install command in the directory containing the 
!     popper source to copy the program to /usr/etc.
  
  5.  Enable syslogging:
  
--- 173,179 ----
      source.
  
  4.  Issue the make install command in the directory containing the 
!     popper source to copy the program to /usr/libexec.
  
  5.  Enable syslogging:
  
***************
*** 221,240 ****
      +   On BSD 4.3 and SunOS 4.0 systems, add the following line to the 
          /etc/inetd.conf file:
  
!         pop stream tcp nowait root /usr/etc/popper popper
!         pop2 stream tcp nowait root /usr/etc/popper popper
  
      +   On Ultrix systems, add the following line to the 
          /etc/inetd.conf file:
  
!         pop stream tcp nowait /usr/etc/popper popper
!         pop2 stream tcp nowait /usr/etc/popper popper
  
      +   On SunOS 3.5 systems, add the following line to the 
          /etc/servers file:
  
!         pop tcp /usr/etc/popper
!         pop2 tcp /usr/etc/popper
  
          Kill and restart the inetd daemon.
  
--- 221,240 ----
      +   On BSD 4.3 and SunOS 4.0 systems, add the following line to the 
          /etc/inetd.conf file:
  
!         pop stream tcp nowait root /usr/libexec/popper popper
!         pop2 stream tcp nowait root /usr/libexec/popper popper
  
      +   On Ultrix systems, add the following line to the 
          /etc/inetd.conf file:
  
!         pop stream tcp nowait /usr/libexec/popper popper
!         pop2 stream tcp nowait /usr/libexec/popper popper
  
      +   On SunOS 3.5 systems, add the following line to the 
          /etc/servers file:
  
!         pop tcp /usr/libexec/popper
!         pop2 tcp /usr/libexec/popper
  
          Kill and restart the inetd daemon.
  
*** /usr/src/libexec/popper/popper.8.old	Wed Apr  3 15:25:46 1991
--- /usr/src/libexec/popper/popper.8	Wed Nov 27 20:29:54 1996
***************
*** 8,22 ****
  .\" software without specific prior written permission. This software
  .\" is provided ``as is'' without express or implied warranty.
  .\"
! .\" @(#)@(#)popper.8	2.3    2.3    (CCS)   4/2/91     Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n
  .\"
! .TH popper 8 "August 1990"
  .UC 6
  .ad
  .SH NAME
  popper \- pop 3 server
  .SH SYNOPSIS
! .B /usr/etc/popper
  [ -d ]
  [ -t trace-file]
  .SH DESCRIPTION
--- 8,24 ----
  .\" software without specific prior written permission. This software
  .\" is provided ``as is'' without express or implied warranty.
  .\"
! .\" @(#)@(#)popper.8	2.3.1    (2.11BSD)   1996/11/27
! .\" 	Copyright (c) 1990 Regents of the University of California.
! .\" 	All rights reserved.\n
  .\"
! .TH popper 8 "November 27, 1996"
  .UC 6
  .ad
  .SH NAME
  popper \- pop 3 server
  .SH SYNOPSIS
! .B /usr/libexec/popper
  [ -d ]
  [ -t trace-file]
  .SH DESCRIPTION
*** /usr/src/libexec/rexecd/rexecd.8.old	Sun Dec 14 15:08:47 1986
--- /usr/src/libexec/rexecd/rexecd.8	Sat Nov 16 14:31:57 1996
***************
*** 2,19 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rexecd.8c	6.2 (Berkeley) 5/9/86
  .\"
! .TH REXECD 8C "May 9, 1986"
  .UC 5
  .SH NAME
  rexecd \- remote execution server
  .SH SYNOPSIS
! .B /etc/rexecd
  .SH DESCRIPTION
  .I Rexecd
  is the server for the 
! .IR rexec (3X)
  routine.  The server provides remote execution facilities
  with authentication based on user names and
  passwords.
--- 2,19 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)rexecd.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH REXECD 8 "November 16, 1996"
  .UC 5
  .SH NAME
  rexecd \- remote execution server
  .SH SYNOPSIS
! .B /usr/libexec/rexecd
  .SH DESCRIPTION
  .I Rexecd
  is the server for the 
! .IR rexec (3)
  routine.  The server provides remote execution facilities
  with authentication based on user names and
  passwords.
***************
*** 111,117 ****
  .BR stderr ,
  and is not preceded by a flag byte.
  .SH SEE ALSO
! rexec(3X)
  .SH BUGS
  Indicating ``Login incorrect'' as opposed to ``Password incorrect''
  is a security breach which allows people to probe a system for users
--- 111,117 ----
  .BR stderr ,
  and is not preceded by a flag byte.
  .SH SEE ALSO
! rexec(3)
  .SH BUGS
  Indicating ``Login incorrect'' as opposed to ``Password incorrect''
  is a security breach which allows people to probe a system for users
*** /usr/src/libexec/rshd/pathnames.h.old	Tue Sep 19 11:02:39 1989
--- /usr/src/libexec/rshd/pathnames.h	Fri Nov 29 20:34:24 1996
***************
*** 14,23 ****
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.2 (Berkeley) 5/9/89
   */
  
! #define	_PATH_BSHELL	"/bin/sh"
! #define	_PATH_DEFPATH	"PATH=/bin:/usr/ucb:/usr/bin:"
! #define	_PATH_NOLOGIN	"/etc/nologin"
! #define	_PATH_TTY	"/dev/tty"
--- 14,22 ----
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   *
!  *	@(#)pathnames.h	5.2.1 (2.11BSD) 1996/11/29
   */
  
! #include <paths.h>
! 
! #define	_PATH_DEFPATH	"PATH=/bin:/usr/ucb:/usr/bin:/usr/sbin"
*** /usr/src/libexec/rshd/rshd.c.old	Mon May 18 05:09:33 1992
--- /usr/src/libexec/rshd/rshd.c	Fri Nov 29 20:37:54 1996
***************
*** 15,29 ****
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1983, 1988, 1989 The Regents of the University of California.\n\
   All rights reserved.\n";
- #endif /* not lint */
  
! #ifndef lint
! static char sccsid[] = "@(#)rshd.c	5.17.1.3 (Berkeley) 9/11/89";
! #endif /* not lint */
  
  /*
   * remote shell server:
--- 15,27 ----
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1983, 1988, 1989 The Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)rshd.c	5.17.1.4 (Berkeley) 1996/11/29";
! #endif
  
  /*
   * remote shell server:
***************
*** 51,62 ****
  #include <syslog.h>
  #include <arpa/nameser.h>
  #include <resolv.h>
  #include "pathnames.h"
  
  int	errno;
  int	keepalive = 1;
  int	check_all = 0;
- char	*index(), *rindex(), *strncat();
  /*VARARGS1*/
  int	error();
  int	sent_null;
--- 49,61 ----
  #include <syslog.h>
  #include <arpa/nameser.h>
  #include <resolv.h>
+ #include <stdlib.h>
+ #include <string.h>
  #include "pathnames.h"
  
  int	errno;
  int	keepalive = 1;
  int	check_all = 0;
  /*VARARGS1*/
  int	error();
  int	sent_null;
***************
*** 66,72 ****
  	int argc;
  	char **argv;
  {
- 	extern int opterr, optind;
  	extern int _check_rhosts_file;
  	struct linger linger;
  	int ch, on = 1, fromlen;
--- 65,70 ----
*** /usr/src/libexec/talkd/process.c.old	Mon Jan 10 21:49:50 1994
--- /usr/src/libexec/talkd/process.c	Sat Nov 16 21:23:54 1996
***************
*** 5,11 ****
   */
  
  #if	defined(DOSCCS) && !defined(lint)
! static char sccsid[] = "@(#)process.c	5.4.1 (2.11BSD GTE) 1/1/94";
  #endif
  
  /*
--- 5,11 ----
   */
  
  #if	defined(DOSCCS) && !defined(lint)
! static char sccsid[] = "@(#)process.c	5.4.2 (2.11BSD GTE) 1996/11/16";
  #endif
  
  /*
***************
*** 156,163 ****
  	struct stat statb;
  	char ftty[20];
  
! 	if ((fd = fopen("/etc/utmp", "r")) == NULL) {
! 		perror("Can't open /etc/utmp");
  		return (FAILED);
  	}
  #define SCMPN(a, b)	strncmp(a, b, sizeof (a))
--- 156,163 ----
  	struct stat statb;
  	char ftty[20];
  
! 	if ((fd = fopen(_PATH_UTMP, "r")) == NULL) {
! 		warn("Can't open %s", _PATH_UTMP);
  		return (FAILED);
  	}
  #define SCMPN(a, b)	strncmp(a, b, sizeof (a))
*** /usr/src/libexec/talkd/talkd.8.old	Sun Dec 14 15:08:39 1986
--- /usr/src/libexec/talkd/talkd.8	Sat Nov 16 21:24:45 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)talkd.8c	6.2 (Berkeley) 5/21/86
  .\"
! .TH TALKD 8C "May 21, 1986"
  .UC 6
  .SH NAME
  talkd \- remote user communication server
  .SH SYNOPSIS
! .B /etc/talkd
  .SH DESCRIPTION
  .I Talkd
  is the server that notifies a user that somebody else wants to
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)talkd.8	6.2.1 (2.11BSD) 1996/11/16
  .\"
! .TH TALKD 8 "November 16, 1996"
  .UC 6
  .SH NAME
  talkd \- remote user communication server
  .SH SYNOPSIS
! .B /usr/libexec/ntalkd
  .SH DESCRIPTION
  .I Talkd
  is the server that notifies a user that somebody else wants to
*** /usr/src/libexec/tcpd/Makefile.old	Sun Jan 28 01:18:52 1996
--- /usr/src/libexec/tcpd/Makefile	Sat Nov 16 13:41:54 1996
***************
*** 1,7 ****
! # @(#) Makefile 1.19 1996/1/28
  #  Tailored and trimmed version created for 2.11BSD on April 7, 1995.
  
! REAL_DAEMON_DIR=/etc
  RANLIB	= ranlib	# have ranlib (BSD-ish UNIX)
  ARFLAGS	= rv		# most systems
  AUX_OBJ= environ.o
--- 1,7 ----
! # @(#) Makefile 1.20 1996/11/16
  #  Tailored and trimmed version created for 2.11BSD on April 7, 1995.
  
! REAL_DAEMON_DIR=/usr/libexec
  RANLIB	= ranlib	# have ranlib (BSD-ish UNIX)
  ARFLAGS	= rv		# most systems
  AUX_OBJ= environ.o
***************
*** 48,54 ****
  	hosts5access.0 hosts3access.0 hosts_options.0 tcpdchk.0 tcpdmatch.0
  
  install: all
! 	install -s -m 1751 -o root -g staff tcpd /etc/tcpd
  	install -s -m 751 -o root -g staff tcpdmatch /usr/ucb/tcpdmatch
  	install -s -m 751 -o root -g staff try-from /usr/ucb/try-from
  	install -s -m 751 -o root -g staff safe_finger /usr/ucb/safe_finger
--- 48,54 ----
  	hosts5access.0 hosts3access.0 hosts_options.0 tcpdchk.0 tcpdmatch.0
  
  install: all
! 	install -s -m 1751 -o root -g staff tcpd /usr/libexec/tcpd
  	install -s -m 751 -o root -g staff tcpdmatch /usr/ucb/tcpdmatch
  	install -s -m 751 -o root -g staff try-from /usr/ucb/try-from
  	install -s -m 751 -o root -g staff safe_finger /usr/ucb/safe_finger
*** /usr/src/libexec/telnetd/telnetd.8.old	Sun Dec 14 15:08:48 1986
--- /usr/src/libexec/telnetd/telnetd.8	Sat Nov 16 14:15:33 1996
***************
*** 2,15 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)telnetd.8c	6.3 (Berkeley) 5/28/86
  .\"
! .TH TELNETD 8C "May 28, 1986"
  .UC 5
  .SH NAME
  telnetd \- DARPA TELNET protocol server
  .SH SYNOPSIS
! .B /etc/telnetd
  .SH DESCRIPTION
  .I Telnetd
  is a server which supports the DARPA standard
--- 2,15 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)telnetd.8	6.3.1 (2.11BSD) 1996/11/16
  .\"
! .TH TELNETD 8 "November 16, 1996"
  .UC 5
  .SH NAME
  telnetd \- DARPA TELNET protocol server
  .SH SYNOPSIS
! .B /usr/libexec/telnetd
  .SH DESCRIPTION
  .I Telnetd
  is a server which supports the DARPA standard
*** /usr/src/libexec/telnetd/telnetd.c.old	Fri Mar 22 23:01:16 1996
--- /usr/src/libexec/telnetd/telnetd.c	Sat Nov 16 21:40:05 1996
***************
*** 9,15 ****
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)telnetd.c	5.20.2 (2.11BSD) 1996/3/22";
  #endif
  
  /*
--- 9,15 ----
  "@(#) Copyright (c) 1983 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)telnetd.c	5.20.3 (2.11BSD) 1996/11/16";
  #endif
  
  /*
***************
*** 1229,1236 ****
  #include <utmp.h>
  
  struct	utmp wtmp;
! char	wtmpf[]	= "/usr/adm/wtmp";
! char	utmpf[] = "/etc/utmp";
  #define SCPYN(a, b)	strncpy(a, b, sizeof(a))
  #define SCMPN(a, b)	strncmp(a, b, sizeof(a))
  
--- 1229,1236 ----
  #include <utmp.h>
  
  struct	utmp wtmp;
! char	wtmpf[]	= _PATH_WTMP;
! char	utmpf[] = _PATH_UTMP;
  #define SCPYN(a, b)	strncpy(a, b, sizeof(a))
  #define SCMPN(a, b)	strncmp(a, b, sizeof(a))
  
*** /usr/src/local/Makefile.old	Sat Oct 26 20:33:48 1996
--- /usr/src/local/Makefile	Wed Nov 27 20:27:31 1996
***************
*** 1,5 ****
  #
! # 	#(@)Makefile	1.2.1	(2.11BSD) 1996/10/26
  #
  DESTDIR=
  CFLAGS=	-O
--- 1,5 ----
  #
! # 	#(@)Makefile	1.2.2	(2.11BSD) 1996/11/27
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 7,13 ****
  
  # Programs that live in subdirectories, and have makefiles of their own.
  #
! SUBDIR= afio cxref ddd less mkovmake mp mtools popper welcome qterm zmodem
  
  # C programs that live in the current directory and do not need
  # explicit make lines.
--- 7,13 ----
  
  # Programs that live in subdirectories, and have makefiles of their own.
  #
! SUBDIR= afio cxref ddd less mkovmake mp mtools welcome qterm zmodem
  
  # C programs that live in the current directory and do not need
  # explicit make lines.
*** /usr/src/man/man1/Makefile.old	Fri Nov  1 20:38:21 1996
--- /usr/src/man/man1/Makefile	Wed Nov 27 21:38:45 1996
***************
*** 14,20 ****
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	1.5 (2.11BSD) 1996/11/1
  #
  MDIR=	/usr/man/cat1
  SRCS=	adb.1 addbib.1 apply.1 apropos.1 as.1 at.1 atq.1 atrm.1 \
--- 14,20 ----
  # IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  # WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  #
! #	@(#)Makefile	1.6 (2.11BSD) 1996/11/27
  #
  MDIR=	/usr/man/cat1
  SRCS=	adb.1 addbib.1 apply.1 apropos.1 as.1 at.1 atq.1 atrm.1 \
***************
*** 43,49 ****
  	tsort.1 tty.1 ul.1 unifdef.1 uniq.1 units.1 uptime.1 users.1 \
  	uucp.1 uuencode.1 uulog.1 uuname.1 uuq.1 uusend.1 uux.1 \
  	vacation.1 vgrind.1 vi.1 vmstat.1 vwidth.1 w.1 wait.1 wall.1 wc.1 \
! 	what.1 whatis.1 whereis.1 which.1 who.1 whoami.1 whois.1 window.1 \
  	write.1 xstr.1 yacc.1 yes.1
  OBJS1=	adb.0 addbib.0 apply.0 apropos.0 as.0 at.0 atq.0 atrm.0 \
  	awk.0 basename.0 bc.0 biff.0 binmail.0 cal.0 calendar.0 cat.0 \
--- 43,49 ----
  	tsort.1 tty.1 ul.1 unifdef.1 uniq.1 units.1 uptime.1 users.1 \
  	uucp.1 uuencode.1 uulog.1 uuname.1 uuq.1 uusend.1 uux.1 \
  	vacation.1 vgrind.1 vi.1 vmstat.1 vwidth.1 w.1 wait.1 wall.1 wc.1 \
! 	what.1 whatis.1 which.1 who.1 whoami.1 whois.1 window.1 \
  	write.1 xstr.1 yacc.1 yes.1
  OBJS1=	adb.0 addbib.0 apply.0 apropos.0 as.0 at.0 atq.0 atrm.0 \
  	awk.0 basename.0 bc.0 biff.0 binmail.0 cal.0 calendar.0 cat.0 \
***************
*** 71,77 ****
  	tsort.0 tty.0 ul.0 unifdef.0 uniq.0 units.0 uptime.0 users.0 \
  	uucp.0 uuencode.0 uulog.0 uuname.0 uuq.0 uusend.0 uux.0 \
  	vacation.0 vgrind.0 vi.0 vmstat.0 vwidth.0 w.0 wait.0 wall.0 wc.0 \
! 	what.0 whatis.0 whereis.0 which.0 who.0 whoami.0 whois.0 window.0 \
  	write.0 xstr.0 yacc.0 yes.0
  
  .SUFFIXES: .1 .0
--- 71,77 ----
  	tsort.0 tty.0 ul.0 unifdef.0 uniq.0 units.0 uptime.0 users.0 \
  	uucp.0 uuencode.0 uulog.0 uuname.0 uuq.0 uusend.0 uux.0 \
  	vacation.0 vgrind.0 vi.0 vmstat.0 vwidth.0 w.0 wait.0 wall.0 wc.0 \
! 	what.0 whatis.0 which.0 who.0 whoami.0 whois.0 window.0 \
  	write.0 xstr.0 yacc.0 yes.0
  
  .SUFFIXES: .1 .0
*** /usr/src/man/man1/login.1.old	Sun Dec 14 15:06:33 1986
--- /usr/src/man/man1/login.1	Wed Nov 27 20:37:41 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)login.1	6.2 (Berkeley) 5/8/86
  .\"
! .TH LOGIN 1 "May 8, 1986"
  .UC 4
  .SH NAME
  login \- sign on
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)login.1	6.2.1 (2.11BSD) 1996/11/27
  .\"
! .TH LOGIN 1 "November 27, 1996"
  .UC 4
  .SH NAME
  login \- sign on
***************
*** 73,79 ****
  and executed directly (without forking).
  .SH FILES
  .ta \w'/usr/spool/mail/*\ \ 'u
! /etc/utmp	accounting
  .br
  /usr/adm/wtmp	accounting
  .br
--- 73,79 ----
  and executed directly (without forking).
  .SH FILES
  .ta \w'/usr/spool/mail/*\ \ 'u
! /var/run/utmp	accounting
  .br
  /usr/adm/wtmp	accounting
  .br
*** /usr/src/man/man1/mset.1.old	Sun Dec 14 15:06:47 1986
--- /usr/src/man/man1/mset.1	Sat Nov 16 22:31:51 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mset.1	1.3 (Berkeley) 1/11/86
  .\"
! .TH MSET 1 "January 11, 1986"
  .UC 6
  .SH NAME
  mset \- retrieve ASCII to IBM 3270 keyboard map
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)mset.1	1.3.1 (2.11BSD) 1996/11/16
  .\"
! .TH MSET 1 "November 16, 1996"
  .UC 6
  .SH NAME
  mset \- retrieve ASCII to IBM 3270 keyboard map
***************
*** 17,23 ****
  special functions.
  Normally, these mappings are found
  in
! .I /etc/map3270
  (see
  .IR map3270 (5)).
  This information is used by the
--- 17,23 ----
  special functions.
  Normally, these mappings are found
  in
! .I /usr/share/misc/map3270
  (see
  .IR map3270 (5)).
  This information is used by the
***************
*** 28,34 ****
  .I Mset
  can be used store the mapping information in the process environment
  in order to avoid scanning
! .I /etc/map3270
  each time
  .I tn3270
  is invoked.
--- 28,34 ----
  .I Mset
  can be used store the mapping information in the process environment
  in order to avoid scanning
! .I /usr/share/misc/map3270
  each time
  .I tn3270
  is invoked.
***************
*** 45,51 ****
  Normally
  .I mset
  then uses the file
! .I /etc/map3270
  to find the keyboard mapping for that terminal.
  However, if the environment variable
  .B MAP3270
--- 45,51 ----
  Normally
  .I mset
  then uses the file
! .I /usr/share/misc/map3270
  to find the keyboard mapping for that terminal.
  However, if the environment variable
  .B MAP3270
***************
*** 63,69 ****
  then a default mapping
  is used.
  .SH FILES
! /etc/map3270        keyboard mapping for known terminals
  .SH SEE ALSO
  tn3270(1), map3270(5)
  .SH BUGS
--- 63,69 ----
  then a default mapping
  is used.
  .SH FILES
! /usr/share/misc/map3270        keyboard mapping for known terminals
  .SH SEE ALSO
  tn3270(1), map3270(5)
  .SH BUGS
*** /usr/src/man/man1/ps.1.old	Wed Feb 25 04:39:34 1987
--- /usr/src/man/man1/ps.1	Sat Nov 16 22:32:49 1996
***************
*** 106,112 ****
  .TP
  .B U
  causes ps to update a private database where is keeps system
! information.  Thus ``ps U'' should be included in the /etc/rc file.
  .TP
  .B #
  A process number may be given,
--- 106,112 ----
  .TP
  .B U
  causes ps to update a private database where is keeps system
! information.  Thus ``ps \-U'' should be included in the /etc/rc file.
  .TP
  .B #
  A process number may be given,
***************
*** 195,201 ****
  .br
  /dev	searched to find swap device and tty names
  .br
! /etc/psdatabase	system namelist and device information
  .SH "SEE ALSO"
  kill(1), w(1), pstat(8)
  .SH BUGS
--- 195,201 ----
  .br
  /dev	searched to find swap device and tty names
  .br
! /var/run/psdatabase	system namelist and device information
  .SH "SEE ALSO"
  kill(1), w(1), pstat(8)
  .SH BUGS
*** /usr/src/man/man1/talk.1.old	Sun Dec 14 15:06:43 1986
--- /usr/src/man/man1/talk.1	Wed Nov 27 20:38:57 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)talk.1	6.2 (Berkeley) 5/5/86
  .\"
! .TH TALK 1 "May 5, 1986"
  .UC 5
  .SH NAME
  talk \- talk to another user
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)talk.1	6.2.1 (2.11BSD) 1996/11/27
  .\"
! .TH TALK 1 "November 27, 1996"
  .UC 5
  .SH NAME
  talk \- talk to another user
***************
*** 88,94 ****
  .SH FILES
  /etc/hosts	to find the recipient's machine
  .br
! /etc/utmp	to find the recipient's tty
  .SH "SEE ALSO"
  mesg(1), who(1), mail(1), write(1)
  .SH BUGS
--- 88,94 ----
  .SH FILES
  /etc/hosts	to find the recipient's machine
  .br
! /var/run/utmp	to find the recipient's tty
  .SH "SEE ALSO"
  mesg(1), who(1), mail(1), write(1)
  .SH BUGS
*** /usr/src/man/man1/tn3270.1.old	Sun Dec 14 15:06:47 1986
--- /usr/src/man/man1/tn3270.1	Wed Nov 27 20:44:53 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tn3270.1	1.3 (Berkeley) 1/11/86
  .\"
! .TH TN3270 1 "January 11, 1986"
  .UC 6
  .SH NAME
  tn3270 \- full-screen remote login to IBM VM/CMS
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)tn3270.1	1.3.1 (2.11BSD) 1996/11/27
  .\"
! .TH TN3270 1 "November 27, 1996"
  .UC 6
  .SH NAME
  tn3270 \- full-screen remote login to IBM VM/CMS
***************
*** 45,51 ****
  from the ASCII keyboard into appropriate 3270 control strings.
  This mapping is terminal dependent and is specified
  in a description file,
! .IR /etc/map3270 ,
  (see
  .IR map3270 (5))
  or in an environment variable
--- 45,51 ----
  from the ASCII keyboard into appropriate 3270 control strings.
  This mapping is terminal dependent and is specified
  in a description file,
! .IR /usr/share/misc/map3270 ,
  (see
  .IR map3270 (5))
  or in an environment variable
***************
*** 113,119 ****
  .SH FILES
  /etc/termcap
  .br
! /etc/map3270
  .SH AUTHOR
  Greg Minshall
  .SH SEE ALSO
--- 113,119 ----
  .SH FILES
  /etc/termcap
  .br
! /usr/share/misc/map3270
  .SH AUTHOR
  Greg Minshall
  .SH SEE ALSO
*** /usr/src/man/man1/users.1.old	Sun Dec 14 15:06:16 1986
--- /usr/src/man/man1/users.1	Wed Nov 27 20:45:56 1996
***************
*** 2,10 ****
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)users.1	6.1 (Berkeley) 4/29/85
  .\"
! .TH USERS 1 "April 29, 1985"
  .UC
  .SH NAME
  users \- compact list of users who are on the system
--- 2,10 ----
  .\" All rights reserved.  The Berkeley software License Agreement
  .\" specifies the terms and conditions for redistribution.
  .\"
! .\"	@(#)users.1	6.1.1 (2.11BSD) 1996/11/27
  .\"
! .TH USERS 1 "November 27, 1996"
  .UC
  .SH NAME
  users \- compact list of users who are on the system
***************
*** 15,20 ****
  lists the login names of the users currently on the system in a compact,
  one-line format.
  .SH FILES
! /etc/utmp
  .SH SEE ALSO
  who(1)
--- 15,20 ----
  lists the login names of the users currently on the system in a compact,
  one-line format.
  .SH FILES
! /var/run/utmp
  .SH SEE ALSO
  who(1)
