From owner-cvs-usrsbin  Sat Aug  2 12:41:16 1997
Return-Path: <owner-cvs-usrsbin>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id MAA08893
          for cvs-usrsbin-outgoing; Sat, 2 Aug 1997 12:41:16 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id MAA08614;
          Sat, 2 Aug 1997 12:37:35 -0700 (PDT)
From: Bruce Evans <bde@FreeBSD.ORG>
Received: (from bde@localhost)
	by freefall.freebsd.org (8.8.6/8.8.5) id MAA21211;
	Sat, 2 Aug 1997 12:36:08 -0700 (PDT)
Date: Sat, 2 Aug 1997 12:36:08 -0700 (PDT)
Message-Id: <199708021936.MAA21211@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-usrsbin@FreeBSD.ORG
Subject: cvs commit: src/usr.sbin - Imported sources
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

bde         1997/08/02 12:36:07 PDT

  src/usr.sbin - Imported sources
  Update of /home/ncvs/src/usr.sbin
  In directory freefall.freebsd.org:/c/bde/src/lite2/usr.sbin
  
  Log Message:
  Import Lite2's src/usr.sbin, except for timed.  All changed files
  except one unimportant one have already left the vendor branch.
  
  Status:
  
  Vendor Tag:	CSRG
  Release Tags:	bsd_44_lite_2
  		
  U src/usr.sbin/Makefile.inc
  U src/usr.sbin/Makefile
  U src/usr.sbin/rmt/rmt.8
  U src/usr.sbin/rmt/Makefile
  U src/usr.sbin/rmt/rmt.c
  U src/usr.sbin/ac/ac.8
  U src/usr.sbin/accton/Makefile
  U src/usr.sbin/accton/accton.c
  U src/usr.sbin/arp/Makefile
  C src/usr.sbin/arp/arp.8
  C src/usr.sbin/arp/arp.c
  C src/usr.sbin/arp/arp4.4
  U src/usr.sbin/amd/Makefile
  C src/usr.sbin/amd/config/misc-bsd44l.h
  U src/usr.sbin/amd/config/Makefile.hpux
  U src/usr.sbin/amd/config/Makefile.irix
  U src/usr.sbin/amd/config/Makefile.config
  U src/usr.sbin/amd/config/Makefile.bsd44
  U src/usr.sbin/amd/config/os-type
  U src/usr.sbin/amd/config/mount_aix.c
  C src/usr.sbin/amd/config/mtab_bsd.c
  U src/usr.sbin/amd/config/mtab_file.c
  U src/usr.sbin/amd/config/mtab_ultrix.c
  U src/usr.sbin/amd/config/os-acis43.h
  U src/usr.sbin/amd/config/os-aix3.h
  U src/usr.sbin/amd/config/os-aux.h
  C src/usr.sbin/amd/config/os-bsd44.h
  U src/usr.sbin/amd/config/os-concentrix.h
  U src/usr.sbin/amd/config/os-convex.h
  U src/usr.sbin/amd/config/os-defaults.h
  U src/usr.sbin/amd/config/os-dgux.h
  U src/usr.sbin/amd/config/os-hcx.h
  U src/usr.sbin/amd/config/os-hpux.h
  U src/usr.sbin/amd/config/os-irix.h
  U src/usr.sbin/amd/config/os-riscix.h
  U src/usr.sbin/amd/config/os-sos3.h
  U src/usr.sbin/amd/config/os-sos4.h
  U src/usr.sbin/amd/config/os-u2_2.h
  U src/usr.sbin/amd/config/RELEASE
  U src/usr.sbin/amd/config/os-u3_0.h
  U src/usr.sbin/amd/config/os-u4_0.h
  U src/usr.sbin/amd/config/os-utek.h
  U src/usr.sbin/amd/config/os-xinu43.h
  U src/usr.sbin/amd/config/arch
  U src/usr.sbin/amd/config/Configure
  U src/usr.sbin/amd/config/Makefile.aix3
  U src/usr.sbin/amd/config/misc-next.h
  U src/usr.sbin/amd/config/os-fpx4.h
  U src/usr.sbin/amd/config/os-hlh42.h
  U src/usr.sbin/amd/config/os-next.h
  U src/usr.sbin/amd/config/os-pyrOSx.h
  U src/usr.sbin/amd/config/misc-irix.h
  U src/usr.sbin/amd/config/misc-ultrix.h
  U src/usr.sbin/amd/config/mount_irix.c
  U src/usr.sbin/amd/config/os-umax43.h
  U src/usr.sbin/amd/config/os-utx32.h
  U src/usr.sbin/amd/config/mtab_aix.c
  U src/usr.sbin/amd/config/misc-hpux.h
  U src/usr.sbin/amd/config/misc-aix3.h
  U src/usr.sbin/amd/config/os-stellix.h
  U src/usr.sbin/amd/config/Makefile.irix3
  U src/usr.sbin/amd/config/mount_stellix.c
  U src/usr.sbin/amd/config/Makefile.irix4
  U src/usr.sbin/amd/config/Makefile.stellix
  U src/usr.sbin/amd/config/os-irix3.h
  U src/usr.sbin/amd/config/os-irix4.h
  U src/usr.sbin/amd/config/misc-stellix.h
  U src/usr.sbin/amd/config/os-u4_2.h
  U src/usr.sbin/amd/config/newvers.sh
  U src/usr.sbin/amd/amq/amq.8
  U src/usr.sbin/amd/amq/amq.c
  U src/usr.sbin/amd/amq/Makefile
  U src/usr.sbin/amd/mk-amd-map/Makefile
  U src/usr.sbin/amd/mk-amd-map/mk-amd-map.c
  U src/usr.sbin/amd/mk-amd-map/mk-amd-map.8
  U src/usr.sbin/amd/rpcx/amq.h
  U src/usr.sbin/amd/rpcx/amq_xdr.c
  U src/usr.sbin/amd/rpcx/amq_clnt.c
  U src/usr.sbin/amd/rpcx/mount.h
  U src/usr.sbin/amd/rpcx/mount_xdr.c
  U src/usr.sbin/amd/rpcx/nfs_prot.h
  U src/usr.sbin/amd/rpcx/nfs_prot_svc.c
  U src/usr.sbin/amd/rpcx/nfs_prot_xdr.c
  U src/usr.sbin/amd/rpcx/amq.x
  U src/usr.sbin/amd/rpcx/amq_svc.c
  U src/usr.sbin/amd/include/config.h
  U src/usr.sbin/amd/include/uwait.h
  U src/usr.sbin/amd/include/re.h
  U src/usr.sbin/amd/include/remagic.h
  U src/usr.sbin/amd/include/fstype.h
  U src/usr.sbin/amd/include/am.h
  U src/usr.sbin/amd/amd/ChangeLog
  U src/usr.sbin/amd/amd/nfs_start.c
  U src/usr.sbin/amd/amd/nfs_subr.c
  U src/usr.sbin/amd/amd/clock.c
  U src/usr.sbin/amd/amd/efs_ops.c
  U src/usr.sbin/amd/amd/amq_subr.c
  U src/usr.sbin/amd/amd/ifs_ops.c
  U src/usr.sbin/amd/amd/host_ops.c
  U src/usr.sbin/amd/amd/map.c
  U src/usr.sbin/amd/amd/get_args.c
  U src/usr.sbin/amd/amd/info_hes.c
  U src/usr.sbin/amd/amd/info_ndbm.c
  U src/usr.sbin/amd/amd/info_nis.c
  U src/usr.sbin/amd/amd/info_passwd.c
  U src/usr.sbin/amd/amd/mapc.c
  U src/usr.sbin/amd/amd/info_file.c
  U src/usr.sbin/amd/amd/mntfs.c
  U src/usr.sbin/amd/amd/mtab.c
  U src/usr.sbin/amd/amd/misc_rpc.c
  C src/usr.sbin/amd/amd/nfs_ops.c
  U src/usr.sbin/amd/amd/mount_fs.c
  U src/usr.sbin/amd/amd/opts.c
  U src/usr.sbin/amd/amd/pfs_ops.c
  U src/usr.sbin/amd/amd/restart.c
  C src/usr.sbin/amd/amd/amd.8
  U src/usr.sbin/amd/amd/rpc_fwd.c
  U src/usr.sbin/amd/amd/sched.c
  U src/usr.sbin/amd/amd/sfs_ops.c
  C src/usr.sbin/amd/amd/ufs_ops.c
  U src/usr.sbin/amd/amd/srvr_afs.c
  U src/usr.sbin/amd/amd/srvr_nfs.c
  U src/usr.sbin/amd/amd/util.c
  U src/usr.sbin/amd/amd/umount_fs.c
  U src/usr.sbin/amd/amd/info_union.c
  U src/usr.sbin/amd/amd/nfsx_ops.c
  U src/usr.sbin/amd/amd/am_ops.c
  C src/usr.sbin/amd/amd/afs_ops.c
  U src/usr.sbin/amd/amd/xutil.c
  U src/usr.sbin/amd/amd/wire.c
  U src/usr.sbin/amd/amd/Makefile
  U src/usr.sbin/amd/amd/amd.c
  U src/usr.sbin/amd/doc/amdref.cps
  U src/usr.sbin/amd/doc/amdref.texinfo
  U src/usr.sbin/amd/doc/texinfo.tex
  U src/usr.sbin/amd/doc/Makefile
  U src/usr.sbin/amd/doc/amdref.ps
  U src/usr.sbin/amd/text/amd.start.ex
  U src/usr.sbin/amd/text/README
  C src/usr.sbin/amd/text/INSTALL
  U src/usr.sbin/amd/text/COPYRIGHT
  U src/usr.sbin/amd/maps/a_net
  U src/usr.sbin/amd/maps/a_master
  U src/usr.sbin/amd/fsinfo/fsi_dict.c
  U src/usr.sbin/amd/fsinfo/fsi_gram.y
  U src/usr.sbin/amd/fsinfo/fsi_lex.l
  U src/usr.sbin/amd/fsinfo/fsi_data.h
  U src/usr.sbin/amd/fsinfo/fsi_util.c
  U src/usr.sbin/amd/fsinfo/fsinfo.c
  U src/usr.sbin/amd/fsinfo/fsinfo.h
  U src/usr.sbin/amd/fsinfo/wr_atab.c
  U src/usr.sbin/amd/fsinfo/wr_bparam.c
  U src/usr.sbin/amd/fsinfo/wr_dumpset.c
  U src/usr.sbin/amd/fsinfo/wr_exportfs.c
  U src/usr.sbin/amd/fsinfo/wr_fstab.c
  U src/usr.sbin/amd/fsinfo/Makefile
  U src/usr.sbin/amd/fsinfo/fsi_analyze.c
  U src/usr.sbin/amd/fsinfo/fsinfo.8
  U src/usr.sbin/amd/fsinfo/conf/automounts
  U src/usr.sbin/amd/fsinfo/conf/csg_sun3
  U src/usr.sbin/amd/fsinfo/conf/csg_vax
  U src/usr.sbin/amd/fsinfo/conf/diskless_sun3_sos4
  U src/usr.sbin/amd/fsinfo/conf/users
  U src/usr.sbin/amd/fsinfo/conf/hosts/whoops.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/bigears.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/dylan.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/flamingo.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/ganymede.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/gould.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/gummo.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/ivax.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/obsidian.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/pelican.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/rvax.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/sky.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/svax.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tcsun1.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tcsun2.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tcsun3.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tcsun4.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tcsun5.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/toytown.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/truth.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun1.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun10.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun11.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun12.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun13.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun14.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun15.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun16.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun17.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun18.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun19.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun2.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun3.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun4.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun5.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun6.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun7.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun8.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsun9.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/tsunfs.doc.ic.ac.uk
  U src/usr.sbin/amd/fsinfo/conf/hosts/achilles.doc.ic.ac.uk
  U src/usr.sbin/chroot/chroot.8
  U src/usr.sbin/chroot/chroot.c
  U src/usr.sbin/chroot/Makefile
  U src/usr.sbin/config/lang.l
  U src/usr.sbin/config/config.h
  U src/usr.sbin/config/mkioconf.c
  U src/usr.sbin/config/main.c
  U src/usr.sbin/config/mkheaders.c
  U src/usr.sbin/config/Makefile
  U src/usr.sbin/config/mkmakefile.c
  U src/usr.sbin/config/mkswapconf.c
  U src/usr.sbin/config/mkglue.c
  U src/usr.sbin/config/config.8
  U src/usr.sbin/config/mkubglue.c
  U src/usr.sbin/config/config.y
  U src/usr.sbin/config/SMM.doc/e.t
  U src/usr.sbin/config/SMM.doc/0.t
  U src/usr.sbin/config/SMM.doc/1.t
  U src/usr.sbin/config/SMM.doc/2.t
  U src/usr.sbin/config/SMM.doc/3.t
  U src/usr.sbin/config/SMM.doc/4.t
  U src/usr.sbin/config/SMM.doc/5.t
  U src/usr.sbin/config/SMM.doc/6.t
  U src/usr.sbin/config/SMM.doc/a.t
  U src/usr.sbin/config/SMM.doc/b.t
  U src/usr.sbin/config/SMM.doc/c.t
  U src/usr.sbin/config/SMM.doc/d.t
  U src/usr.sbin/config/SMM.doc/spell.ok
  U src/usr.sbin/config/SMM.doc/Makefile
  U src/usr.sbin/diskpart/diskpart.8
  U src/usr.sbin/diskpart/Makefile
  C src/usr.sbin/diskpart/diskpart.c
  C src/usr.sbin/update/update.c
  C src/usr.sbin/update/update.8
  C src/usr.sbin/update/Makefile
  U src/usr.sbin/mtree/misc.c
  U src/usr.sbin/mtree/compare.c
  U src/usr.sbin/mtree/create.c
  U src/usr.sbin/mtree/mtree.8
  U src/usr.sbin/mtree/mtree.c
  U src/usr.sbin/mtree/mtree.h
  C src/usr.sbin/mtree/spec.c
  U src/usr.sbin/mtree/extern.h
  U src/usr.sbin/mtree/verify.c
  C src/usr.sbin/mtree/Makefile
  N src/usr.sbin/config.new/config.8
  U src/usr.sbin/config.new/config.h
  U src/usr.sbin/config.new/files.c
  U src/usr.sbin/config.new/gram.y
  U src/usr.sbin/config.new/hash.c
  U src/usr.sbin/config.new/main.c
  U src/usr.sbin/config.new/mkheaders.c
  U src/usr.sbin/config.new/mkioconf.c
  U src/usr.sbin/config.new/mkmakefile.c
  U src/usr.sbin/config.new/mkswap.c
  U src/usr.sbin/config.new/pack.c
  U src/usr.sbin/config.new/scan.l
  U src/usr.sbin/config.new/sem.c
  U src/usr.sbin/config.new/sem.h
  U src/usr.sbin/config.new/util.c
  C src/usr.sbin/config.new/Makefile
  U src/usr.sbin/eeprom/Makefile
  U src/usr.sbin/eeprom/eeprom.8
  U src/usr.sbin/eeprom/eeprom.c
  U src/usr.sbin/eeprom/pathnames.h
  U src/usr.sbin/inetd/inetd.c
  C src/usr.sbin/inetd/inetd.8
  U src/usr.sbin/inetd/Makefile
  U src/usr.sbin/inetd/pathnames.h
  U src/usr.sbin/iostat/Makefile
  U src/usr.sbin/iostat/iostat.8
  C src/usr.sbin/iostat/iostat.c
  U src/usr.sbin/kgmon/kgmon.8
  U src/usr.sbin/kgmon/Makefile
  U src/usr.sbin/kgmon/kgmon.c
  U src/usr.sbin/lpr/Makefile
  U src/usr.sbin/lpr/SMM.doc/spell.ok
  U src/usr.sbin/lpr/SMM.doc/0.t
  U src/usr.sbin/lpr/SMM.doc/1.t
  U src/usr.sbin/lpr/SMM.doc/2.t
  U src/usr.sbin/lpr/SMM.doc/3.t
  U src/usr.sbin/lpr/SMM.doc/4.t
  U src/usr.sbin/lpr/SMM.doc/5.t
  U src/usr.sbin/lpr/SMM.doc/6.t
  U src/usr.sbin/lpr/SMM.doc/7.t
  U src/usr.sbin/lpr/SMM.doc/Makefile
  U src/usr.sbin/lpr/filters/Makefile
  U src/usr.sbin/lpr/filters/lpf.c
  U src/usr.sbin/lpr/common_source/aux.c
  U src/usr.sbin/lpr/common_source/lp.h
  U src/usr.sbin/lpr/common_source/rmjob.c
  U src/usr.sbin/lpr/common_source/lp.local.h
  U src/usr.sbin/lpr/common_source/common.c
  U src/usr.sbin/lpr/common_source/startdaemon.c
  U src/usr.sbin/lpr/common_source/printcap.c
  U src/usr.sbin/lpr/common_source/displayq.c
  U src/usr.sbin/lpr/common_source/aux.h
  U src/usr.sbin/lpr/common_source/pathnames.h
  U src/usr.sbin/lpr/lpd/Makefile
  U src/usr.sbin/lpr/lpd/lpd.c
  U src/usr.sbin/lpr/lpd/recvjob.c
  U src/usr.sbin/lpr/lpd/lpd.8
  U src/usr.sbin/lpr/lpd/lpdchar.c
  U src/usr.sbin/lpr/lpd/extern.h
  U src/usr.sbin/lpr/lpd/printjob.c
  U src/usr.sbin/lpr/lpr/lpr.1
  U src/usr.sbin/lpr/lpr/lpr.c
  U src/usr.sbin/lpr/lpr/Makefile
  U src/usr.sbin/lpr/lpq/lpq.1
  U src/usr.sbin/lpr/lpq/lpq.c
  U src/usr.sbin/lpr/lpq/Makefile
  U src/usr.sbin/lpr/lprm/Makefile
  U src/usr.sbin/lpr/lprm/lprm.1
  U src/usr.sbin/lpr/lprm/lprm.c
  U src/usr.sbin/lpr/lpc/extern.h
  U src/usr.sbin/lpr/lpc/lpc.8
  U src/usr.sbin/lpr/lpc/Makefile
  U src/usr.sbin/lpr/lpc/cmds.c
  U src/usr.sbin/lpr/lpc/lpc.c
  U src/usr.sbin/lpr/lpc/cmdtab.c
  U src/usr.sbin/lpr/lpc/lpc.h
  U src/usr.sbin/lpr/lptest/lptest.1
  U src/usr.sbin/lpr/lptest/Makefile
  U src/usr.sbin/lpr/lptest/lptest.c
  U src/usr.sbin/lpr/pac/Makefile
  U src/usr.sbin/lpr/pac/pac.8
  U src/usr.sbin/lpr/pac/pac.c
  U src/usr.sbin/sliplogin/pathnames.h
  U src/usr.sbin/sliplogin/sliplogin.8
  U src/usr.sbin/sliplogin/Makefile
  U src/usr.sbin/sliplogin/sliplogin.c
  C src/usr.sbin/sliplogin/slip.login
  C src/usr.sbin/sliplogin/slip.hosts
  U src/usr.sbin/pstat/pstat.c
  U src/usr.sbin/pstat/Makefile
  U src/usr.sbin/pstat/pstat.8
  U src/usr.sbin/kvm_mkdb/kvm_mkdb.8
  U src/usr.sbin/kvm_mkdb/nlist.c
  U src/usr.sbin/kvm_mkdb/kvm_mkdb.c
  U src/usr.sbin/kvm_mkdb/Makefile
  U src/usr.sbin/kvm_mkdb/testdb.c
  U src/usr.sbin/kvm_mkdb/extern.h
  U src/usr.sbin/sysctl/Makefile
  C src/usr.sbin/sysctl/sysctl.c
  C src/usr.sbin/sysctl/sysctl.8
  U src/usr.sbin/sysctl/pathconf.c
  U src/usr.sbin/rwhod/rwhod.8
  U src/usr.sbin/rwhod/rwhod.c
  U src/usr.sbin/rwhod/Makefile
  N src/usr.sbin/sendmail/README
  U src/usr.sbin/syslogd/Makefile
  U src/usr.sbin/syslogd/pathnames.h
  U src/usr.sbin/syslogd/syslogd.c
  U src/usr.sbin/syslogd/syslogd.8
  U src/usr.sbin/syslogd/syslog.conf.5
  C src/usr.sbin/portmap/portmap.c
  C src/usr.sbin/portmap/portmap.8
  C src/usr.sbin/portmap/Makefile
  C src/usr.sbin/edquota/edquota.8
  C src/usr.sbin/edquota/edquota.c
  U src/usr.sbin/edquota/Makefile
  U src/usr.sbin/edquota/pathnames.h
  U src/usr.sbin/vipw/vipw.c
  U src/usr.sbin/vipw/vipw.8
  C src/usr.sbin/vipw/pw_util.c
  U src/usr.sbin/vipw/Makefile
  U src/usr.sbin/vipw/pw_util.h
  U src/usr.sbin/bad144/bad144.8
  U src/usr.sbin/bad144/Makefile
  C src/usr.sbin/bad144/bad144.c
  U src/usr.sbin/chown/chgrp.1
  U src/usr.sbin/chown/chown.8
  U src/usr.sbin/chown/chown.c
  U src/usr.sbin/chown/Makefile
  U src/usr.sbin/dev_mkdb/dev_mkdb.c
  U src/usr.sbin/dev_mkdb/dev_mkdb.8
  U src/usr.sbin/dev_mkdb/Makefile
  C src/usr.sbin/pwd_mkdb/pwd_mkdb.8
  U src/usr.sbin/pwd_mkdb/pwd_mkdb.c
  U src/usr.sbin/pwd_mkdb/Makefile
  U src/usr.sbin/pwd_mkdb/pw_scan.c
  U src/usr.sbin/pwd_mkdb/pw_scan.h
  U src/usr.sbin/repquota/repquota.8
  C src/usr.sbin/repquota/repquota.c
  U src/usr.sbin/repquota/Makefile
  U src/usr.sbin/quotaon/quotaon.8
  U src/usr.sbin/quotaon/Makefile
  U src/usr.sbin/quotaon/quotaon.c
  U src/usr.sbin/trpt/trpt.8
  U src/usr.sbin/trpt/Makefile
  U src/usr.sbin/trpt/trpt.c
  U src/usr.sbin/trsp/trsp.8
  U src/usr.sbin/trsp/trsp.c
  U src/usr.sbin/trsp/Makefile
  C src/usr.sbin/traceroute/traceroute.8
  U src/usr.sbin/traceroute/Makefile
  U src/usr.sbin/traceroute/traceroute.c
  U src/usr.sbin/traceroute/mean.awk
  U src/usr.sbin/traceroute/median.awk
  U src/usr.sbin/traceroute/README
  C src/usr.sbin/quot/quot.8
  
  35 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jCSRG:yesterday -jCSRG src/usr.sbin