# Copyright 2000 - 2004 George Shaffer
# Anyone may use or modify this code for any purpose PROVIDED
# that as long as it is recognizably derived from this code,
# that this copyright notice, remains intact and unchanged.
# No warrantees of any kind are expressed or implied.

# OpenBSD unnecessary and/or dangerous files.  Move them to 
# /deleted for archiving to CDR.

mkdir /deleted

# The original kernel
mv /bsdo /deleted/bsdo

mkdir /deleted/bin

mv /bin/[ /deleted/bin/[

# Used by daily. If moved will need to comment/delete lines
# from /etc/daily.
# mv /bin/domainname /deleted/bin/domainname

mv /bin/rcp /deleted/bin/rcp
mv /bin/rmail /deleted/bin/rmail
mv /bin/test /deleted/bin/test


mkdir /deleted/sbin

mv /sbin/ancontrol /deleted/sbin/ancontrol
mv /sbin/dhclient /deleted/sbin/dhclient
mv /sbin/dhclient-script /deleted/sbin/dhclient-script
mv /sbin/disklabel /deleted/sbin/disklabel
mv /sbin/fsck_msdos /deleted/sbin/fsck_msdos
mv /sbin/fsdb /deleted/sbin/fsdb
mv /sbin/fdisk /deleted/sbin/fdisk
mv /sbin/fsirand /deleted/sbin/fsirand

# Removed from 3.0.
# Keep the next two for a firewall
# mv /sbin/ipf /deleted/sbin/ipf
# mv /sbin/ipfstat /deleted/sbin/ipfstat
# Keep ipnat if you use NAT with a firewall or router
# mv /sbin/ipnat /deleted/sbin/ipnat
# 3.0 replacements for the above are:
# mv /sbin/pfctl /deleted/sbin/pfctl
# mv /sbin/pflogd /deleted/sbin/pflogd

mv /sbin/ipsecadm /deleted/sbin/ipsecadm
mv /sbin/isakmpd /deleted/sbin/isakmpd
mv /sbin/mount_ados /deleted/sbin/mount_ados
mv /sbin/mount_nfs /deleted/sbin/mount_nfs
mv /sbin/mount_null /deleted/sbin/mount_null
mv /sbin/mount_portal /deleted/sbin/mount_portal
mv /sbin/mount_procfs /deleted/sbin/mount_procfs
mv /sbin/mount_tcfs /deleted/sbin/mount_tcfs
mv /sbin/mount_umap /deleted/sbin/mount_umap
mv /sbin/mount_union /deleted/sbin/mount_union
mv /sbin/mount_xfs /deleted/sbin/mount_xfs
mv /sbin/mountd /deleted/sbin/mountd

mv /sbin/newfs /deleted/sbin/newfs
ln -s /mnt/cd/sbin/newfs /sbin/newfs

mv /sbin/newfs_msdos /deleted/sbin/newfs_msdos
mv /sbin/nfsd /deleted/sbin/nfsd
# nfsiod no longer included (2.8 or 2.9)
# mv /sbin/nfsiod /deleted/sbin/nfsiod
mv /sbin/photurisd /deleted/sbin/photurisd
mv /sbin/raidctl /deleted/sbin/raidctl
mv /sbin/rtsol /deleted/sbin/rtsol
mv /sbin/scan_ffs /deleted/sbin/scan_ffs
mv /sbin/startkey /deleted/sbin/startkey
mv /sbin/scsi /deleted/sbin/scsi
mv /sbin/wicontrol /deleted/sbin/wicontrol


mkdir /deleted/usr

mkdir /deleted/usr/bin

mv /usr/bin/a2p /deleted/usr/bin/a2p
mv /usr/bin/addftinfo /deleted/usr/bin/addftinfo
mv /usr/bin/afmtodit /deleted/usr/bin/afmtodit
mv /usr/bin/afslog /deleted/usr/bin/afslog
mv /usr/bin/aucat /deleted/usr/bin/aucat
mv /usr/bin/audioctl /deleted/usr/bin/audioctl
mv /usr/bin/banner /deleted/usr/bin/banner
mv /usr/bin/bc /deleted/usr/bin/bc

# Didn't get new mail notices without this.
# mv /usr/bin/biff /deleted/usr/bin/biff

# Used by daily. If moved will need to comment/delete lines
# from /etc/daily.
# mv /usr/bin/calendar /deleted/usr/bin/calendar

mv /usr/bin/c2ph /deleted/usr/bin/c2ph
mv /usr/bin/cdio /deleted/usr/bin/cdio
mv /usr/bin/checknr /deleted/usr/bin/checknr

mv /usr/bin/co /deleted/usr/bin/co
ln -s /mnt/cd/usr/bin/co /usr/bin/co
mv /usr/bin/ci /deleted/usr/bin/ci
ln -s /mnt/cd/usr/bin/ci /usr/bin/ci
mv /usr/bin/col /deleted/usr/bin/col
ln -s /mnt/cd/usr/bin/col /usr/bin/col
mv /usr/bin/colcrt /deleted/usr/bin/colcrt
ln -s /mnt/cd/usr/bin/colcrt /usr/bin/colcrt
mv /usr/bin/compile_et /deleted/usr/bin/compile_et
ln -s /mnt/cd/usr/bin/compile_et /usr/bin/compile_et
mv /usr/bin/cpp /deleted/usr/bin/cpp
ln -s /mnt/cd/usr/bin/cpp /usr/bin/cpp
mv /usr/bin/ctags /deleted/usr/bin/ctags
ln -s /mnt/cd/usr/bin/ctags /usr/bin/ctags

mv /usr/bin/cu /deleted/usr/bin/cu

mv /usr/bin/cvs /deleted/usr/bin/cvs
ln -s /mnt/cd/usr/bin/cvs /usr/bin/cvs
mv /usr/bin/cvsbug /deleted/usr/bin/cvsbug
ln -s /mnt/cd/usr/bin/cvsbug /usr/bin/cvsbug
mv /usr/bin/c++filt /deleted/usr/bin/c++filt
ln -s /mnt/cd/usr/bin/c++filt /usr/bin/c++filt
mv /usr/bin/dbmmanage /deleted/usr/bin/dbmmanage
ln -s /mnt/cd/usr/bin/dbmmanage /usr/bin/dbmmanage

mv /usr/bin/dc /deleted/usr/bin/dc
mv /usr/bin/deroff /deleted/usr/bin/deroff
mv /usr/bin/dprofpp /deleted/usr/bin/dprofpp
mv /usr/bin/elf2olf /deleted/usr/bin/elf2olf
mv /usr/bin/olf2elf /deleted/usr/bin/olf2elf
mv /usr/bin/eqn /deleted/usr/bin/eqn

mv /usr/bin/error /deleted/usr/bin/error
ln -s /mnt/cd/usr/bin/error /usr/bin/error
mv /usr/bin/file2c /deleted/usr/bin/file2c
ln -s /mnt/cd/usr/bin/file2c /usr/bin/file2c

mv /usr/bin/finger /deleted/usr/bin/finger
# mv /usr/bin/fmt /deleted/usr/bin/fmt
# mv /usr/bin/fold /deleted/usr/bin/fold
mv /usr/bin/from /deleted/usr/bin/from
mv /usr/bin/fsplit /deleted/usr/bin/fsplit

# Where ftp is kept, it is renamed to slow a potential 
# intruder. Put a copy of ftp in /deleted so it dosen't 
# need to be put back manually.
cp -p /usr/bin/ftp /deleted/usr/bin/ftp
mv /usr/bin/ftp /usr/bin/abc

mv /usr/bin/gencat /deleted/usr/bin/gencat
mv /usr/bin/gnubc /deleted/usr/bin/gnubc
mv /usr/bin/grodvi /deleted/usr/bin/grodvi
mv /usr/bin/groff /deleted/usr/bin/groff
mv /usr/bin/grog /deleted/usr/bin/grog
mv /usr/bin/grohtml /deleted/usr/bin/grohtml
mv /usr/bin/grolj4 /deleted/usr/bin/grolj4
mv /usr/bin/grops /deleted/usr/bin/grops
mv /usr/bin/grotty /deleted/usr/bin/grotty
mv /usr/bin/gzexe /deleted/usr/bin/gzexe
mv /usr/bin/h2ph /deleted/usr/bin/h2ph
mv /usr/bin/h2xs /deleted/usr/bin/h2xs
mv /usr/bin/help /deleted/usr/bin/help
mv /usr/bin/hpftodit /deleted/usr/bin/hpftodit

# Use with Apache web server: depending on how you value
# convenience vs. security you may want to keep these online.
# Not needed unless you're running Apache and have private
# web areas.
# mv /usr/bin/htdigest /deleted/usr/bin/htdigest
# ln -s /mnt/cd/usr/bin/htdigest /usr/bin/htdigest
# mv /usr/bin/htpasswd /deleted/usr/bin/htpasswd
# ln -s /mnt/cd/usr/bin/htpasswd /usr/bin/htpasswd

mv /usr/bin/ident /deleted/usr/bin/ident

mv /usr/bin/indent /deleted/usr/bin/indent
ln -s /mnt/cd/usr/bin/indent /usr/bin/indent

mv /usr/bin/indxbib /deleted/usr/bin/indxbib
mv /usr/bin/install /deleted/usr/bin/install
ln -s /mnt/cd/usr/bin/install /usr/bin/install
mv /usr/bin/install-info /deleted/usr/bin/install-info
mv /usr/bin/jot /deleted/usr/bin/jot
mv /usr/bin/kauth /deleted/usr/bin/kauth
mv /usr/bin/kdestroy /deleted/usr/bin/kdestroy
mv /usr/bin/kdump /deleted/usr/bin/kdump
mv /usr/bin/kinit /deleted/usr/bin/kinit
mv /usr/bin/klist /deleted/usr/bin/klist
mv /usr/bin/ktrace /deleted/usr/bin/ktrace
mv /usr/bin/lam /deleted/usr/bin/lam
mv /usr/bin/lkbib /deleted/usr/bin/lkbib
mv /usr/bin/lndir /deleted/usr/bin/lndir
mv /usr/bin/locate /deleted/usr/bin/locate
mv /usr/bin/lookbib /deleted/usr/bin/lookbib

# Probably want these if you print on this system.
# mv /usr/bin/lpq /deleted/usr/bin/lpq
# mv /usr/bin/lpr /deleted/usr/bin/lpr
# mv /usr/bin/lprm /deleted/usr/bin/lprm

# Lynx text web browser, may want with a web server.  
# Conversely it is a way to bring in files that will pass
# most firewall setups.
mv /usr/bin/lynx /deleted/usr/bin/lynx

mv /usr/bin/m4 /deleted/usr/bin/m4

mv /usr/bin/make /deleted/usr/bin/make
ln -s /mnt/cd/usr/bin/make /usr/bin/make

mv /usr/bin/makeinfo /deleted/usr/bin/makeinfo
mv /usr/bin/merge /deleted/usr/bin/merge
mv /usr/bin/mesg /deleted/usr/bin/mesg
mv /usr/bin/mixerctl /deleted/usr/bin/mixerctl
mv /usr/bin/midiplay /deleted/usr/bin/midiplay
mv /usr/bin/mset /deleted/usr/bin/mset
mv /usr/bin/nc /deleted/usr/bin/nc
mv /usr/bin/neqn /deleted/usr/bin/neqn

mv /usr/bin/newaliases /deleted/usr/bin/newaliases
ln -s /mnt/cd/usr/bin/newaliases /usr/bin/newaliases

mv /usr/bin/nfsstat /deleted/usr/bin/nfsstat
mv /usr/bin/nroff /deleted/usr/bin/nroff
mv /usr/bin/oldrdist /deleted/usr/bin/oldrdist
mv /usr/bin/page /deleted/usr/bin/page

mv /usr/bin/patch /deleted/usr/bin/patch
ln -s /mnt/cd/usr/bin/patch /usr/bin/patch

# One of the most useful and most dangerous programs
# that comes with OpenBSD is Perl.  A skilled Perl
# programmer can do anything that most compiled languages
# allow and can often do it quicker.  If you don't use
# Perl for Web CGI scripts and don't use it for 
# administrative purposes, then get rid of it.  If
# you do use it, it's probably used so frequently that
# a link is not practical.
#mv /usr/bin/perl /deleted/usr/bin/perl

mv /usr/bin/pfbtops /deleted/usr/bin/pfbtops
mv /usr/bin/pic /deleted/usr/bin/pic
mv /usr/bin/pr /deleted/usr/bin/pr
mv /usr/bin/psbb /deleted/usr/bin/psbb
mv /usr/bin/pstruct /deleted/usr/bin/pstruct

mv /usr/bin/rcs /deleted/usr/bin/rcs
ln -s /mnt/cd/usr/bin/rcs /usr/bin/rcs
mv /usr/bin/rcs2log /deleted/usr/bin/rcs2log
ln -s /mnt/cd/usr/bin/rcs2log /usr/bin/rcs2log
mv /usr/bin/rcsclean /deleted/usr/bin/rcsclean
ln -s /mnt/cd/usr/bin/rcsclean /usr/bin/rcsclean
mv /usr/bin/rcsdiff /deleted/usr/bin/rcsdiff
ln -s /mnt/cd/usr/bin/rcsdiff /usr/bin/rcsdiff
mv /usr/bin/rcsfreeze /deleted/usr/bin/rcsfreeze
ln -s /mnt/cd/usr/bin/rcsfreeze /usr/bin/rcsfreeze
mv /usr/bin/rcsmerge /deleted/usr/bin/rcsmerge
ln -s /mnt/cd/usr/bin/rcsmerge /usr/bin/rcsmerge

mv /usr/bin/rdist /deleted/usr/bin/rdist
mv /usr/bin/rdistd /deleted/usr/bin/rdistd
mv /usr/bin/refer /deleted/usr/bin/refer

mv /usr/bin/rlog /deleted/usr/bin/rlog
ln -s /mnt/cd/usr/bin/rlog /usr/bin/rlog

mv /usr/bin/rlogin /deleted/usr/bin/rlogin
mv /usr/bin/rpcinfo /deleted/usr/bin/rpcinfo
mv /usr/bin/rsh /deleted/usr/bin/rsh
mv /usr/bin/rup /deleted/usr/bin/rup
mv /usr/bin/ruptime /deleted/usr/bin/ruptime
mv /usr/bin/rusers /deleted/usr/bin/rusers
mv /usr/bin/rwall /deleted/usr/bin/rwall
mv /usr/bin/rwho /deleted/usr/bin/rwho
mv /usr/bin/s2p /deleted/usr/bin/s2p
mv /usr/bin/shar /deleted/usr/bin/shar
mv /usr/bin/showmount /deleted/usr/bin/showmount
mv /usr/bin/soelim /deleted/usr/bin/soelim
mv /usr/bin/sup /deleted/usr/bin/sup
mv /usr/bin/talk /deleted/usr/bin/talk
mv /usr/bin/tbl /deleted/usr/bin/tbl

# Telnet. Arguably the most dangerous general purpose hacking
# tool that can be left on a system where it's not needed.
# There is no logical connection between running the client
# versus the server on a particular system.
mv /usr/bin/telnet /deleted/usr/bin/telnet

mv /usr/bin/texi2dvi /deleted/usr/bin/texi2dvi
mv /usr/bin/texindex /deleted/usr/bin/texindex
mv /usr/bin/tfmtodit /deleted/usr/bin/tfmtodit

# Tftp - very insecure transfer protocol.
mv /usr/bin/tftp /deleted/usr/bin/tftp

mv /usr/bin/tip /deleted/usr/bin/tip
mv /usr/bin/tn3270 /deleted/usr/bin/tn3270
mv /usr/bin/troff /deleted/usr/bin/troff

# tsort is needed when rebuilding kernel
# mv /usr/bin/tsort /deleted/usr/bin/tsort

mv /usr/bin/unifdef /deleted/usr/bin/unifdef
mv /usr/bin/units /deleted/usr/bin/units

# The uucp programs have been removed from the
# OpenBSD 3.0 base install.
# mv /usr/bin/uucp /deleted/usr/bin/uucp
# mv /usr/bin/uulog /deleted/usr/bin/uulog
# mv /usr/bin/uudecode /deleted/usr/bin/uudecode
# mv /usr/bin/uuencode /deleted/usr/bin/uuencode
# mv /usr/bin/uuname /deleted/usr/bin/uuname
# mv /usr/bin/uupick /deleted/usr/bin/uupick
# mv /usr/bin/uusched /deleted/usr/bin/uusched
# Used by daily. If moved will need to comment/delete lines
# from /etc/daily.
# mv /usr/bin/uustat /deleted/usr/bin/uustat
# mv /usr/bin/uuto /deleted/usr/bin/uuto
# mv /usr/bin/uux /deleted/usr/bin/uux

mv /usr/bin/vacation /deleted/usr/bin/vacation
mv /usr/bin/vgrind /deleted/usr/bin/vgrind
mv /usr/bin/whois /deleted/usr/bin/whois
mv /usr/bin/window /deleted/usr/bin/window
mv /usr/bin/write /deleted/usr/bin/write
mv /usr/bin/yes /deleted/usr/bin/yes
mv /usr/bin/ypcat /deleted/usr/bin/ypcat
mv /usr/bin/ypmatch /deleted/usr/bin/ypmatch
mv /usr/bin/ypwhich /deleted/usr/bin/ypwhich
mv /usr/bin/yyfix /deleted/usr/bin/yyfix

# Tools for changing user password and other user information
mv /usr/bin/chfn /deleted/usr/bin/chfn
ln -s /mnt/cd/usr/bin/chfn /usr/bin/chfn
mv /usr/bin/chpass /deleted/usr/bin/chpass
ln -s /mnt/cd/usr/bin/chpass /usr/bin/chpass
mv /usr/bin/chsh /deleted/usr/bin/chsh
ln -s /mnt/cd/usr/bin/chsh /usr/bin/chsh
mv /usr/bin/passwd /deleted/usr/bin/passwd
ln -s /mnt/cd/usr/bin/passwd /usr/bin/passwd

# nm used by C compiler
mv /usr/bin/nm /deleted/usr/bin/nm
ln -s /mnt/cd/usr/bin/nm /usr/bin/nm

# comp28.tgz files - linked below.
mv /usr/bin/ar /deleted/usr/bin/ar
mv /usr/bin/as /deleted/usr/bin/as
mv /usr/bin/asa /deleted/usr/bin/asa
mv /usr/bin/c++ /deleted/usr/bin/c++
mv /usr/bin/cc /deleted/usr/bin/cc
mv /usr/bin/f77 /deleted/usr/bin/f77
mv /usr/bin/flex /deleted/usr/bin/flex
mv /usr/bin/flex++ /deleted/usr/bin/flex++
mv /usr/bin/fpr /deleted/usr/bin/fpr
mv /usr/bin/g++ /deleted/usr/bin/g++
mv /usr/bin/g77 /deleted/usr/bin/g77
mv /usr/bin/gcc /deleted/usr/bin/gcc
mv /usr/bin/gcov /deleted/usr/bin/gcov
mv /usr/bin/gdb /deleted/usr/bin/gdb
mv /usr/bin/gprof /deleted/usr/bin/gprof

# Since the whatis listing for ld includes ld.so and most
# of the errors I've seen when using a shell from a boot
# floppy have been the inability to run programs because
# ld.so can't be found I won't take a chance on removing ld.
# mv /usr/bin/ld /deleted/usr/bin/ld

mv /usr/bin/lex /deleted/usr/bin/lex
mv /usr/bin/lint /deleted/usr/bin/lint
mv /usr/bin/lorder /deleted/usr/bin/lorder
mv /usr/bin/mkstr /deleted/usr/bin/mkstr
mv /usr/bin/objdump /deleted/usr/bin/objdump
mv /usr/bin/ranlib /deleted/usr/bin/ranlib
mv /usr/bin/rpcgen /deleted/usr/bin/rpcgen
mv /usr/bin/strip /deleted/usr/bin/strip
mv /usr/bin/xstr /deleted/usr/bin/xstr
mv /usr/bin/yacc /deleted/usr/bin/yacc

ln -s /mnt/cd/usr/bin/ar /usr/bin/ar
ln -s /mnt/cd/usr/bin/as /usr/bin/as
ln -s /mnt/cd/usr/bin/asa /usr/bin/asa
ln -s /mnt/cd/usr/bin/c++ /usr/bin/c++
ln -s /mnt/cd/usr/bin/cc /usr/bin/cc
ln -s /mnt/cd/usr/bin/f77 /usr/bin/f77
ln -s /mnt/cd/usr/bin/flex /usr/bin/flex
ln -s /mnt/cd/usr/bin/flex++ /usr/bin/flex++
ln -s /mnt/cd/usr/bin/fpr /usr/bin/fpr
ln -s /mnt/cd/usr/bin/g++ /usr/bin/g++
ln -s /mnt/cd/usr/bin/g77 /usr/bin/g77
ln -s /mnt/cd/usr/bin/gcc /usr/bin/gcc
ln -s /mnt/cd/usr/bin/gcov /usr/bin/gcov
ln -s /mnt/cd/usr/bin/gdb /usr/bin/gdb
ln -s /mnt/cd/usr/bin/gprof /usr/bin/gprof
# Don't link it if it's not moved.
# ln -s /mnt/cd/usr/bin/ld /usr/bin/ld
ln -s /mnt/cd/usr/bin/lex /usr/bin/lex
ln -s /mnt/cd/usr/bin/lint /usr/bin/lint
ln -s /mnt/cd/usr/bin/lorder /usr/bin/lorder
ln -s /mnt/cd/usr/bin/mkstr /usr/bin/mkstr
ln -s /mnt/cd/usr/bin/objdump /usr/bin/objdump
ln -s /mnt/cd/usr/bin/ranlib /usr/bin/ranlib
ln -s /mnt/cd/usr/bin/rpcgen /usr/bin/rpcgen
ln -s /mnt/cd/usr/bin/strip /usr/bin/strip
ln -s /mnt/cd/usr/bin/xstr /usr/bin/xstr
ln -s /mnt/cd/usr/bin/yacc /usr/bin/yacc


mkdir /deleted/usr/libexec

mv /usr/libexec/afsd /deleted/usr/libexec/afsd
mv /usr/libexec/comsat /deleted/usr/libexec/comsat
# mv /usr/libexec/cpp /deleted/usr/libexec/cpp

mkdir /deleted/usr/libexec/cvs
mkdir /deleted/usr/libexec/cvs/contrib

mv /usr/libexec/cvs/contrib/sccs2rcs /deleted/usr/libexec/cvs/contrib/sccs2rcs
mv /usr/libexec/cvs/contrib/cln_hist /deleted/usr/libexec/cvs/contrib/cln_hist
mv /usr/libexec/cvs/contrib/commit_prep /deleted/usr/libexec/cvs/contrib/commit_prep
mv /usr/libexec/cvs/contrib/cvs2vendor /deleted/usr/libexec/cvs/contrib/cvs2vendor
mv /usr/libexec/cvs/contrib/cvs_acls /deleted/usr/libexec/cvs/contrib/cvs_acls
mv /usr/libexec/cvs/contrib/cvscheck /deleted/usr/libexec/cvs/contrib/cvscheck
mv /usr/libexec/cvs/contrib/log /deleted/usr/libexec/cvs/contrib/log
mv /usr/libexec/cvs/contrib/log_accum /deleted/usr/libexec/cvs/contrib/log_accum
mv /usr/libexec/cvs/contrib/mfpipe /deleted/usr/libexec/cvs/contrib/mfpipe
mv /usr/libexec/cvs/contrib/rcs-to-cvs /deleted/usr/libexec/cvs/contrib/rcs-to-cvs
mv /usr/libexec/cvs/contrib/rcs2log /deleted/usr/libexec/cvs/contrib/rcs2log
mv /usr/libexec/cvs/contrib/rcslock /deleted/usr/libexec/cvs/contrib/rcslock
mv /usr/libexec/cvs/contrib/clmerge /deleted/usr/libexec/cvs/contrib/clmerge
rm -r /usr/libexec/cvs
ln -s /mnt/cd/usr/libexec/cvs /usr/libexec/cvs

mv /usr/libexec/fingerd /deleted/usr/libexec/fingerd

# Need the ftpd server on this machine for automated web updates
# Wrap it in tcpd so only workstation can send updates.
# mv /usr/libexec/ftpd /deleted/usr/libexec/ftpd

mv /usr/libexec/identd /deleted/usr/libexec/identd
mv /usr/libexec/kadmind /deleted/usr/libexec/kadmind
mv /usr/libexec/kauthd /deleted/usr/libexec/kauthd
mv /usr/libexec/kerberos /deleted/usr/libexec/kerberos
mv /usr/libexec/kpropd /deleted/usr/libexec/kpropd
mv /usr/libexec/kpasswdd /deleted/usr/libexec/kpasswdd

# comp28.tgz files
mv /usr/libexec/lint1 /deleted/usr/libexec/lint1
mv /usr/libexec/lint2 /deleted/usr/libexec/lint2

ln -s /mnt/cd/usr/libexec/lint1 /usr/libexec/lint1
ln -s /mnt/cd/usr/libexec/lint2 /usr/libexec/lint2

# This one too for printing.
# mkdir /deleted/usr/libexec/lpr
# mv /usr/libexec/lpr/lpf /deleted/usr/libexec/lpr/lpf

mv /usr/libexec/ntalkd /deleted/usr/libexec/ntalkd
mv /usr/libexec/rexecd /deleted/usr/libexec/rexecd
mv /usr/libexec/rlogind /deleted/usr/libexec/rlogind
mv /usr/libexec/rpc.rquotad /deleted/usr/libexec/rpc.rquotad
mv /usr/libexec/rpc.rstatd /deleted/usr/libexec/rpc.rstatd
mv /usr/libexec/rpc.rusersd /deleted/usr/libexec/rpc.rusersd
mv /usr/libexec/rpc.rwalld /deleted/usr/libexec/rpc.rwalld
mv /usr/libexec/rpc.sprayd /deleted/usr/libexec/rpc.sprayd
mv /usr/libexec/rshd /deleted/usr/libexec/rshd
mv /usr/libexec/safe_finger /deleted/usr/libexec/safe_finger
mv /usr/libexec/smtpd /deleted/usr/libexec/smtpd
mv /usr/libexec/smtpfwdd /deleted/usr/libexec/smtpfwdd
mv /usr/libexec/tftpd /deleted/usr/libexec/tftpd

# If you use telnet then uncomment the following
# mv /usr/libexec/telnetd /deleted/usr/libexec/telnetd

# The uucp programs are not part of the OpenBSD 3.0 base install.
# mkdir /deleted/usr/libexec/uucp
# mv /usr/libexec/uucp/uuchk /deleted/usr/libexec/uucp/uuchk
# mv /usr/libexec/uucp/uucico /deleted/usr/libexec/uucp/uucico
# mv /usr/libexec/uucp/uuconv /deleted/usr/libexec/uucp/uuconv
# mv /usr/libexec/uucp/uuxqt /deleted/usr/libexec/uucp/uuxqt

mv /usr/libexec/uucpd /deleted/usr/libexec/uucpd

# Most systems won't have nmap and snort but if they do, these
# programs should not be left lying around casually.  Keep
# snort for any dedicated IDS.
# mkdir /deleted/usr/local
# mkdir /deleted/usr/local/bin
# mv /usr/local/bin/nmap /deleted/usr/local/bin/nmap
# ln -s /mnt/cd/usr/local/bin/nmap /usr/local/bin/nmap
# mv /usr/local/bin/snort /deleted/usr/local/bin/snort
# ln -s /mnt/cd/usr/local/bin/snort /usr/local/bin/snort
# /usr/local/bin ADDED files


mkdir /deleted/usr/sbin

mv /usr/sbin/dhcpd /deleted/usr/sbin/dhcpd
mv /usr/sbin/dhcrelay /deleted/usr/sbin/dhcrelay
mv /usr/sbin/faithd /deleted/usr/sbin/faithd

# The next two programs are no longer a part of 2.9 and the
# lines must be removed or they will cause errors.
# mv /usr/sbin/fed /deleted/usr/sbin/fed
# mv /usr/sbin/fontedit /deleted/usr/sbin/fontedit

mv /usr/sbin/fs /deleted/usr/sbin/fs
mv /usr/sbin/getencstat /deleted/usr/sbin/getencstat

# More user, actually group, maintenance.
mv /usr/sbin/group /deleted/usr/sbin/group
ln -s /mnt/cd/usr/sbin/group /usr/sbin/group
mv /usr/sbin/groupadd /deleted/usr/sbin/groupadd
ln -s /mnt/cd/usr/sbin/groupadd /usr/sbin/groupadd
mv /usr/sbin/groupdel /deleted/usr/sbin/groupdel
ln -s /mnt/cd/usr/sbin/groupdel /usr/sbin/groupdel
mv /usr/sbin/groupinfo /deleted/usr/sbin/groupinfo
ln -s /mnt/cd/usr/sbin/groupinfo /usr/sbin/groupinfo
mv /usr/sbin/groupmod /deleted/usr/sbin/groupmod
ln -s /mnt/cd/usr/sbin/groupmod /usr/sbin/groupmod

# Keep the next two for a firewall.
# mv /usr/sbin/ipftest /deleted/usr/sbin/ipftest
# mv /usr/sbin/ipmon /deleted/usr/sbin/ipmon

# The following were removed in 3.0
# Prior to 2.9 I'd not removed the following three
# but can see little reason not to.  Ipsend allows
# creating spoofed packets.  Ipresend could be used
# in serious firewall testing but none look like they
# belong on a production machine.
# mv /usr/sbin/ipresend /deleted/usr/sbin/ipresend
# mv /usr/sbin/ipsend /deleted/usr/sbin/ipsend
# mv /usr/sbin/iptest /deleted/usr/sbin/iptest

mv /usr/sbin/kadmin /deleted/usr/sbin/kadmin
mv /usr/sbin/kdb_destroy /deleted/usr/sbin/kdb_destroy
mv /usr/sbin/kdb_edit /deleted/usr/sbin/kdb_edit
mv /usr/sbin/kdb_init /deleted/usr/sbin/kdb_init
mv /usr/sbin/kprop /deleted/usr/sbin/kprop
mv /usr/sbin/kdb_util /deleted/usr/sbin/kdb_util
mv /usr/sbin/ksrvutil /deleted/usr/sbin/ksrvutil
mv /usr/sbin/kstash /deleted/usr/sbin/kstash
mv /usr/sbin/logresolve /deleted/usr/sbin/logresolve

# Likely want the next three if you print from this system.
# mv /usr/sbin/lpc /deleted/usr/sbin/lpc
# mv /usr/sbin/lpd /deleted/usr/sbin/lpd
# mv /usr/sbin/lptest /deleted/usr/sbin/lptest

mv /usr/sbin/makedbm /deleted/usr/sbin/makedbm
mv /usr/sbin/makemap /deleted/usr/sbin/makemap

# Removed from 3.0
# mv /usr/sbin/map-mbone /deleted/usr/sbin/map-mbone

mv /usr/sbin/mkalias /deleted/usr/sbin/mkalias
mv /usr/sbin/mknetid /deleted/usr/sbin/mknetid
mv /usr/sbin/mopa.out /deleted/usr/sbin/mopa.out
mv /usr/sbin/mopchk /deleted/usr/sbin/mopchk
mv /usr/sbin/mopd /deleted/usr/sbin/mopd
mv /usr/sbin/mopprobe /deleted/usr/sbin/mopprobe
mv /usr/sbin/moptrace /deleted/usr/sbin/moptrace

# Removed from 3.0
# mv /usr/sbin/mrinfo /deleted/usr/sbin/mrinfo
# mv /usr/sbin/mtrace /deleted/usr/sbin/mtrace

mv /usr/sbin/named /deleted/usr/sbin/named
mv /usr/sbin/ndc /deleted/usr/sbin/ndc
mv /usr/sbin/ndp /deleted/usr/sbin/ndp
mv /usr/sbin/pac /deleted/usr/sbin/pac
mv /usr/sbin/portmap /deleted/usr/sbin/portmap

mv /usr/sbin/pkg_add /deleted/usr/sbin/pkg_add
ln -s /mnt/cd/usr/sbin/pkg_add /usr/sbin/pkg_add
mv /usr/sbin/pkg_create /deleted/usr/sbin/pkg_create
ln -s /mnt/cd/usr/sbin/pkg_create /usr/sbin/pkg_create
mv /usr/sbin/pkg_delete /deleted/usr/sbin/pkg_delete
ln -s /mnt/cd/usr/sbin/pkg_delete /usr/sbin/pkg_delete

mv /usr/sbin/popa3d /deleted/usr/sbin/popa3d

# Depending on connection type, some of the following
# may be needed.
# mv /usr/sbin/ppp /deleted/usr/sbin/ppp
# mv /usr/sbin/pppoe /deleted/usr/sbin/pppoe
# mv /usr/sbin/pppctl /deleted/usr/sbin/pppctl
# mv /usr/sbin/pppd /deleted/usr/sbin/pppd
# mv /usr/sbin/pppstats /deleted/usr/sbin/pppstats

mv /usr/sbin/pts /deleted/usr/sbin/pts
mv /usr/sbin/rbootd /deleted/usr/sbin/rbootd

# Won't need this if using NTP
# mv /usr/sbin/rdate /deleted/usr/sbin/rdate

mv /usr/sbin/revnetgroup /deleted/usr/sbin/revnetgroup
mv /usr/sbin/rip6query /deleted/usr/sbin/rip6query
mv /usr/sbin/rpc.bootparamd /deleted/usr/sbin/rpc.bootparamd
mv /usr/sbin/rpc.lockd /deleted/usr/sbin/rpc.lockd
mv /usr/sbin/rpc.pcnfsd /deleted/usr/sbin/rpc.pcnfsd
mv /usr/sbin/rpc.yppasswdd /deleted/usr/sbin/rpc.yppasswdd
mv /usr/sbin/rmt /deleted/usr/sbin/rmt
mv /usr/sbin/rtsold /deleted/usr/sbin/rtsold
mv /usr/sbin/rwhod /deleted/usr/sbin/rwhod
mv /usr/sbin/sesd /deleted/usr/sbin/sesd
mv /usr/sbin/setencstat /deleted/usr/sbin/setencstat
mv /usr/sbin/setobjstat /deleted/usr/sbin/setobjstat
mv /usr/sbin/stdethers /deleted/usr/sbin/stdethers
mv /usr/sbin/sliplogin /deleted/usr/sbin/sliplogin
mv /usr/sbin/spray /deleted/usr/sbin/spray
mv /usr/sbin/slstats /deleted/usr/sbin/slstats
mv /usr/sbin/stdhosts /deleted/usr/sbin/stdhosts
mv /usr/sbin/suexec /deleted/usr/sbin/suexec

# Keep the web server where needed.
# mv /usr/sbin/httpd /deleted/usr/sbin/httpd

mv /usr/sbin/supfilesrv /deleted/usr/sbin/supfilesrv
mv /usr/sbin/supscan /deleted/usr/sbin/supscan

# Needed to work with packet filter logs
# mv /usr/sbin/tcpdump /deleted/usr/sbin/tcpdump

# Don't need these if using NTP.
# mv /usr/sbin/timed /deleted/usr/sbin/timed
# mv /usr/sbin/timedc /deleted/usr/sbin/timedc

mv /usr/sbin/trpt /deleted/usr/sbin/trpt
mv /usr/sbin/trsp /deleted/usr/sbin/trsp
mv /usr/sbin/usbdevs /deleted/usr/sbin/usbdevs
mv /usr/sbin/vos /deleted/usr/sbin/vos
mv /usr/sbin/ypbind /deleted/usr/sbin/ypbind
mv /usr/sbin/ypinit /deleted/usr/sbin/ypinit
mv /usr/sbin/yppoll /deleted/usr/sbin/yppoll
mv /usr/sbin/yppush /deleted/usr/sbin/yppush
mv /usr/sbin/ypserv /deleted/usr/sbin/ypserv
mv /usr/sbin/ypset /deleted/usr/sbin/ypset
mv /usr/sbin/yptest /deleted/usr/sbin/yptest
mv /usr/sbin/ypxfr /deleted/usr/sbin/ypxfr
mv /usr/sbin/ypxfr_1perday /deleted/usr/sbin/ypxfr_1perday
mv /usr/sbin/zdump /deleted/usr/sbin/zdump
mv /usr/sbin/ypxfr_1perhour /deleted/usr/sbin/ypxfr_1perhour
mv /usr/sbin/ypxfr_2perday /deleted/usr/sbin/ypxfr_2perday
mv /usr/sbin/zic /deleted/usr/sbin/zic
mv /usr/sbin/zzz /deleted/usr/sbin/zzz
mv /usr/sbin/apmd /deleted/usr/sbin/apmd
mv /usr/sbin/ab /deleted/usr/sbin/ab
mv /usr/sbin/apm /deleted/usr/sbin/apm
mv /usr/sbin/apachectl /deleted/usr/sbin/apachectl
mv /usr/sbin/apxs /deleted/usr/sbin/apxs
mv /usr/sbin/bootpd /deleted/usr/sbin/bootpd
mv /usr/sbin/bootpgw /deleted/usr/sbin/bootpgw
mv /usr/sbin/bootpef /deleted/usr/sbin/bootpef
mv /usr/sbin/bootptest /deleted/usr/sbin/bootptest
mv /usr/sbin/chat /deleted/usr/sbin/chat

# User maintenance
mv /usr/sbin/adduser /deleted/usr/sbin/adduser
mv /usr/sbin/pwd_mkdb /deleted/usr/sbin/pwd_mkdb
mv /usr/sbin/rmuser /deleted/usr/sbin/rmuser
mv /usr/sbin/user /deleted/usr/sbin/user
mv /usr/sbin/userdel /deleted/usr/sbin/userdel
mv /usr/sbin/userinfo /deleted/usr/sbin/userinfo
mv /usr/sbin/usermod /deleted/usr/sbin/usermod
mv /usr/sbin/useradd /deleted/usr/sbin/useradd
mv /usr/sbin/vipw /deleted/usr/sbin/vipw

ln -s /mnt/cd/usr/sbin/adduser /usr/sbin/adduser
ln -s /mnt/cd/usr/sbin/pwd_mkdb /usr/sbin/pwd_mkdb
ln -s /mnt/cd/usr/sbin/rmuser /usr/sbin/rmuser
ln -s /mnt/cd/usr/sbin/user /usr/sbin/user
ln -s /mnt/cd/usr/sbin/userdel /usr/sbin/userdel
ln -s /mnt/cd/usr/sbin/userinfo /usr/sbin/userinfo
ln -s /mnt/cd/usr/sbin/usermod /usr/sbin/usermod
ln -s /mnt/cd/usr/sbin/useradd /usr/sbin/useradd
ln -s /mnt/cd/usr/sbin/vipw /usr/sbin/vipw

# comp28.tgz development files
mv /usr/sbin/gspa /deleted/usr/sbin/gspa
mv /usr/sbin/gspahextoc /deleted/usr/sbin/gspahextoc
mv /usr/sbin/kgmon /deleted/usr/sbin/kgmon

ln -s /mnt/cd/usr/sbin/gspa /usr/sbin/gspa
ln -s /mnt/cd/usr/sbin/gspahextoc /usr/sbin/gspahextoc
ln -s /mnt/cd/usr/sbin/kgmon /usr/sbin/kgmon