diff -ur 3.0-RELEASE/etc/aliases 3.1-RELEASE/etc/aliases --- 3.0-RELEASE/etc/aliases Thu Feb 18 17:15:15 1999 +++ 3.1-RELEASE/etc/aliases Mon Feb 15 19:45:33 1999 @@ -1,4 +1,4 @@ -# $Id: aliases,v 1.6 1997/08/19 17:16:14 wosch Exp $ +# $Id: aliases,v 1.8.2.1 1999/02/09 15:07:12 des Exp $ # @(#)aliases 5.3 (Berkeley) 5/24/90 # # Aliases in this file will NOT be expanded in the header from @@ -12,6 +12,11 @@ # See also RFC 2142, `MAILBOX NAMES FOR COMMON SERVICES, ROLES # AND FUNCTIONS', May 1997 +# Pretty much everything else in this file points to "root", so +# you would do well in either reading roots mailbox or forwarding +# roots email from here. + +# root: me@my.domain # Basic system aliases -- these MUST be present MAILER-DAEMON: postmaster @@ -25,6 +30,7 @@ news: root nobody: root operator: root +pop: root system: root toor: root usenet: news @@ -32,7 +38,6 @@ xten: root # Well-known aliases -- these should be filled in! -# root: # manager: # dumper: diff -ur 3.0-RELEASE/etc/amd.map 3.1-RELEASE/etc/amd.map --- 3.0-RELEASE/etc/amd.map Thu Feb 18 17:15:15 1999 +++ 3.1-RELEASE/etc/amd.map Mon Feb 15 19:45:33 1999 @@ -1,2 +1,2 @@ -/defaults type:=host;fs:=${autodir}/${rhost};rhost:=${key} -* opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev +/defaults type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key} +* opts:=rw,grpid,resvport,vers=2,proto=udp,nosuid,nodev Only in 3.1-RELEASE/etc: defaults diff -ur 3.0-RELEASE/etc/disktab 3.1-RELEASE/etc/disktab --- 3.0-RELEASE/etc/disktab Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/disktab Mon Feb 15 19:45:33 1999 @@ -1,4 +1,4 @@ -# $Id: disktab,v 1.17 1998/10/06 12:42:55 dfr Exp $ +# $Id: disktab,v 1.18 1999/01/12 00:25:49 jkh Exp $ # # Disk geometry and partition layout tables. # Key: @@ -205,6 +205,11 @@ :ns#2880:nc#1:\ :pa#2880:oa#0:ba#4096:fa#512:\ :pc#2880:oc#0:bc#4096:fc#512: + +minimum2:ty=mfs:se#512:nt#1:rm#300:\ + :ns#5760:nc#1:\ + :pa#5760:oa#0:ba#4096:fa#512:\ + :pc#5760:oc#0:bc#4096:fc#512: zip100|zip 100:\ :ty=removable:se#512:nc#96:nt#64:ns#32:\ diff -ur 3.0-RELEASE/etc/group 3.1-RELEASE/etc/group --- 3.0-RELEASE/etc/group Thu Feb 18 17:15:15 1999 +++ 3.1-RELEASE/etc/group Mon Feb 15 19:45:33 1999 @@ -1,4 +1,4 @@ -# $Id: group,v 1.17 1998/09/13 23:05:46 brian Exp $ +# $Id: group,v 1.18 1998/12/01 21:19:49 dillon Exp $ # wheel:*:0:root daemon:*:1:daemon @@ -13,6 +13,7 @@ games:*:13: staff:*:20:root guest:*:31:root +bind:*:53: uucp:*:66: xten:*:67:xten dialer:*:68: diff -ur 3.0-RELEASE/etc/host.conf 3.1-RELEASE/etc/host.conf --- 3.0-RELEASE/etc/host.conf Thu Feb 18 17:15:15 1999 +++ 3.1-RELEASE/etc/host.conf Mon Feb 15 19:45:33 1999 @@ -1,7 +1,7 @@ -# $Id: host.conf,v 1.4 1997/02/23 09:20:40 peter Exp $ -# Default is to use the nameserver first -bind -# If that doesn't work, then try the /etc/hosts file +# $Id: host.conf,v 1.5 1998/11/16 02:02:30 jkh Exp $ +# First try the /etc/hosts file hosts +# Now try the nameserver next. +bind # If you have YP/NIS configured, uncomment the next line # nis diff -ur 3.0-RELEASE/etc/inetd.conf 3.1-RELEASE/etc/inetd.conf --- 3.0-RELEASE/etc/inetd.conf Thu Feb 18 17:15:15 1999 +++ 3.1-RELEASE/etc/inetd.conf Mon Feb 15 19:45:33 1999 @@ -1,4 +1,4 @@ -# $Id: inetd.conf,v 1.30 1998/09/30 16:12:40 wosch Exp $ +# $Id: inetd.conf,v 1.33 1998/12/01 22:01:59 dillon Exp $ # # Internet server configuration database # @@ -12,8 +12,10 @@ #exec stream tcp nowait root /usr/libexec/rexecd rexecd #uucpd stream tcp nowait root /usr/libexec/uucpd uucpd #nntp stream tcp nowait usenet /usr/libexec/nntpd nntpd -comsat dgram udp wait root /usr/libexec/comsat comsat -ntalk dgram udp wait root /usr/libexec/ntalkd ntalkd +# run comsat as root to be able to print partial mailbox contents w/ biff, +# or use the safer tty:tty to just print that new mail has been received. +comsat dgram udp wait tty:tty /usr/libexec/comsat comsat +ntalk dgram udp wait tty:tty /usr/libexec/ntalkd ntalkd #tftp dgram udp wait nobody /usr/libexec/tftpd tftpd /tftpboot #bootps dgram udp wait root /usr/libexec/bootpd bootpd # @@ -61,9 +63,13 @@ # #imap4 stream tcp nowait root /usr/local/libexec/imapd imapd # +# Return error for all "ident" requests +# +#ident stream tcp nowait root internal +# # example entry for the optional ident server # -#ident stream tcp wait root /usr/local/sbin/identd identd -w -t120 +#ident stream tcp wait kmem:kmem /usr/local/sbin/identd identd -w -t120 # # example entry for the optional qmail MTA # Only in 3.1-RELEASE/etc: isdn diff -ur 3.0-RELEASE/etc/locate.rc 3.1-RELEASE/etc/locate.rc --- 3.0-RELEASE/etc/locate.rc Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/locate.rc Mon Feb 15 19:45:33 1999 @@ -1,13 +1,13 @@ # # /etc/locate.rc - command script for updatedb(8) # -# $Id: locate.rc,v 1.6 1998/03/08 16:09:26 wosch Exp $ +# $Id: locate.rc,v 1.7 1998/11/29 00:57:03 wosch Exp $ # # All commented values are the defaults # # temp directory -#TMPDIR="/var/tmp" +#TMPDIR="/tmp" # the actual database #FCODES="/var/db/locate.database" diff -ur 3.0-RELEASE/etc/login.conf 3.1-RELEASE/etc/login.conf --- 3.0-RELEASE/etc/login.conf Thu Feb 18 17:15:15 1999 +++ 3.1-RELEASE/etc/login.conf Mon Feb 15 19:45:33 1999 @@ -9,23 +9,22 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $Id: login.conf,v 1.22 1998/09/17 17:02:39 dt Exp $ +# $Id: login.conf,v 1.26.2.1 1999/01/26 07:29:43 dg Exp $ # # Default settings effectively disable resource limits, see the # examples below for a starting point to enable them. -# Example defaults +# defaults # These settings are used by login(1) by default for classless users # Note that entries like "cputime" set both "cputime-cur" and "cputime-max" default:\ :copyright=/etc/COPYRIGHT:\ :welcome=/etc/motd:\ - :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\ + :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ :path=~/bin /bin /usr/bin /usr/local/bin:\ - :manpath=/usr/share/man /usr/local/man:\ - :nologin=/etc/nologin:\ + :nologin=/var/run/nologin:\ :cputime=unlimited:\ :datasize=unlimited:\ :stacksize=unlimited:\ @@ -123,10 +122,10 @@ #standard:\ # :copyright=/etc/COPYRIGHT:\ # :welcome=/etc/motd:\ -# :setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\ +# :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ # :path=~/bin /bin /usr/bin /usr/local/bin:\ # :manpath=/usr/share/man /usr/local/man:\ -# :nologin=/etc/nologin:\ +# :nologin=/var/run/nologin:\ # :cputime=1h30m:\ # :datasize=8M:\ # :stacksize=2M:\ @@ -325,4 +324,4 @@ #russian:Russian Users Accounts:\ # :charset=KOI8-R:\ # :lang=ru_RU.KOI8-R:\ -# :tc=default: \ No newline at end of file +# :tc=default: diff -ur 3.0-RELEASE/etc/make.conf 3.1-RELEASE/etc/make.conf --- 3.0-RELEASE/etc/make.conf Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/make.conf Mon Feb 15 19:45:33 1999 @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.70 1998/10/16 03:26:54 peter Exp $ +# $Id: make.conf,v 1.73.2.1 1999/02/03 22:26:35 asami Exp $ # # This file, if present, will be read by make (see /usr/share/mk/sys.mk). # It allows you to override macro definitions to make without changing @@ -13,13 +13,12 @@ # #CFLAGS= -O -pipe # -# Another useful entry is # +# Avoid compiling profiled libraries #NOPROFILE= true -# Avoid compiling profiled libraries # +# Compare before install #INSTALL=install -C -# Compare before install # # To avoid building the default system perl #NOPERL= true @@ -38,14 +37,6 @@ # #COPTFLAGS= -O -pipe # -# To use an ELF kernel, you can set this flag. MAKE SURE that you have a -# working /boot/loader installed. /boot.config should specify "/boot/loader" -# as the kernel. The bootblocks load the third stage loader, then it loads -# the kernel proper and any other modules you want. Its startup script -# file is /boot/loader.conf: -# -#KERNFORMAT= elf -# # To compile and install the 4.4 lite libm instead of the default use: # #WANT_CSRG_LIBM= yes @@ -118,11 +109,6 @@ #MOTIFLIB= -L${X11BASE}/lib -lXm # # -# If you are running behind a firewall, uncomment the following to leave a -# hint for various make-spawned utilities that they should use passive FTP. -# -#FTP_PASSIVE_MODE= YES -# # If you're resident in the USA, this will help various ports to determine # whether or not they should attempt to comply with the various U.S. # export regulations on certain types of software which do not apply to @@ -143,7 +129,7 @@ # remove the "/${DIST_SUBDIR}/" part.) # #MASTER_SITE_BACKUP?= \ -# ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/${DIST_SUBDIR}/ +# ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/ # # If you want your port fetches to check the above site first (before # the MASTER_SITES specified in the port Makefiles), uncomment the @@ -166,6 +152,9 @@ #MASTER_SITE_PERL_CPAN= ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/%SUBDIR%/ #MASTER_SITE_TEX_CTAN= ftp://ftp.tex.ac.uk/tex-archive/%SUBDIR%/ #MASTER_SITE_SUNSITE= ftp://sunsite.unc.edu/pub/Linux/%SUBDIR%/ +#MASTER_SITE_KDE= ftp://ftp.kde.org/pub/kde/%SUBDIR%/ +#MASTER_SITE_COMP_SOURCES= ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/ +#MASTER_SITE_GNOME= ftp://ftp.gnome.org/pub/GNOME/sources/%SUBDIR%/ # # # Kerberos IV @@ -192,7 +181,6 @@ #SUPFILE= /usr/share/examples/cvsup/standard-supfile #SUPFILE1= /usr/share/examples/cvsup/secure-supfile #SUPFILE2= /usr/share/examples/cvsup/ports-supfile - # # top(1) uses a hash table for the user names. The size of this hash # can be tuned to match the number of local users. The table size should @@ -200,5 +188,3 @@ # /etc/passwd. The default number is 20011. # #TOP_TABLE_SIZE= 101 - - diff -ur 3.0-RELEASE/etc/manpath.config 3.1-RELEASE/etc/manpath.config --- 3.0-RELEASE/etc/manpath.config Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/manpath.config Mon Feb 15 19:45:33 1999 @@ -1,4 +1,4 @@ -# $Id: manpath.config,v 1.8 1998/10/02 13:01:59 ache Exp $ +# $Id: manpath.config,v 1.8.2.1 1999/02/05 10:43:24 markm Exp $ # # This file is read by manpath to configure the mandatory manpath, to # map each path element to a manpath element and to determine where the @@ -17,7 +17,7 @@ MANDATORY_MANPATH /usr/share/man MANDATORY_MANPATH /usr/share/perl/man MANDATORY_MANPATH /usr/local/man -#MANDATORY_MANPATH /usr/X386/man +MANDATORY_MANPATH /usr/local/lib/perl5/5.00502/man MANDATORY_MANPATH /usr/X11R6/man # # set up PATH to MANPATH mapping @@ -25,5 +25,4 @@ MANPATH_MAP /bin /usr/share/man MANPATH_MAP /usr/bin /usr/share/man MANPATH_MAP /usr/local/bin /usr/local/man -#MANPATH_MAP /usr/X386/bin /usr/X386/man MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man Only in 3.1-RELEASE/etc: manpath.config.sample diff -ur 3.0-RELEASE/etc/master.passwd 3.1-RELEASE/etc/master.passwd --- 3.0-RELEASE/etc/master.passwd Thu Feb 18 17:15:17 1999 +++ 3.1-RELEASE/etc/master.passwd Mon Feb 15 19:45:33 1999 @@ -1,11 +1,14 @@ root::0:0::0:0:Charlie &:/root:/bin/csh toor:*:0:0::0:0:Bourne-again Superuser:/root: daemon:*:1:1::0:0:Owner of many system processes:/root:/sbin/nologin -operator:*:2:5::0:0:System &:/usr/guest/operator:/bin/csh +operator:*:2:5::0:0:System &:/:/sbin/nologin bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/sbin/nologin +tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin +kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin news:*:8:8::0:0:News Subsystem:/:/sbin/nologin man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/sbin/nologin +bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/sbin/nologin pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin diff -ur 3.0-RELEASE/etc/mtree/BSD.include.dist 3.1-RELEASE/etc/mtree/BSD.include.dist --- 3.0-RELEASE/etc/mtree/BSD.include.dist Thu Feb 18 17:15:33 1999 +++ 3.1-RELEASE/etc/mtree/BSD.include.dist Mon Feb 15 19:45:43 1999 @@ -1,4 +1,4 @@ -# $Id: BSD.include.dist,v 1.21 1998/09/19 10:41:35 vanilla Exp $ +# $Id: BSD.include.dist,v 1.24 1998/12/13 04:38:28 dillon Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -50,6 +50,8 @@ rpc .. rpcsvc + .. + security .. ss .. diff -ur 3.0-RELEASE/etc/mtree/BSD.local.dist 3.1-RELEASE/etc/mtree/BSD.local.dist --- 3.0-RELEASE/etc/mtree/BSD.local.dist Thu Feb 18 17:15:33 1999 +++ 3.1-RELEASE/etc/mtree/BSD.local.dist Mon Feb 15 19:45:43 1999 @@ -1,4 +1,4 @@ -# $Id: BSD.local.dist,v 1.42 1998/10/11 17:31:35 markm Exp $ +# $Id: BSD.local.dist,v 1.44 1998/12/18 08:06:34 asami Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -168,6 +168,10 @@ .. doc .. + emacs + site-lisp + .. + .. examples .. misc @@ -224,6 +228,8 @@ lt_LN.ISO_8859-1 .. lt_LN.ISO_8859-2 + .. + lt_LN.DIS_8859-15 .. nl_BE.ISO_8859-1 .. diff -ur 3.0-RELEASE/etc/mtree/BSD.root.dist 3.1-RELEASE/etc/mtree/BSD.root.dist --- 3.0-RELEASE/etc/mtree/BSD.root.dist Thu Feb 18 17:15:33 1999 +++ 3.1-RELEASE/etc/mtree/BSD.root.dist Mon Feb 15 19:45:43 1999 @@ -1,4 +1,4 @@ -# $Id: BSD.root.dist,v 1.31 1998/09/30 22:27:27 jkh Exp $ +# $Id: BSD.root.dist,v 1.37.2.1 1999/02/09 22:35:34 jkh Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -14,6 +14,8 @@ .. /set type=dir uname=root gname=wheel mode=0755 etc + defaults + .. periodic daily .. @@ -24,6 +26,8 @@ .. gnats .. + isdn mode=0700 + .. kerberosIV .. mail @@ -31,6 +35,10 @@ mtree .. namedb +# leave commented out until buildworld/installworld can +# handle new user ids +# s uname=bind gname=bind mode=0750 +# .. .. ppp .. @@ -43,13 +51,15 @@ .. mnt .. + modules + .. proc mode=0555 .. root .. sbin .. - tmp uname=root gname=wheel mode=01777 + tmp mode=01777 .. usr .. diff -ur 3.0-RELEASE/etc/mtree/BSD.usr.dist 3.1-RELEASE/etc/mtree/BSD.usr.dist --- 3.0-RELEASE/etc/mtree/BSD.usr.dist Thu Feb 18 17:15:33 1999 +++ 3.1-RELEASE/etc/mtree/BSD.usr.dist Mon Feb 15 19:45:43 1999 @@ -1,4 +1,4 @@ -# $Id: BSD.usr.dist,v 1.135 1998/10/11 17:31:35 markm Exp $ +# $Id: BSD.usr.dist,v 1.146.2.1 1999/02/02 06:05:13 jhay Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -215,6 +215,10 @@ 28.cvs .. .. + ru + FAQ + .. + .. smm 01.setup .. @@ -289,6 +293,10 @@ 31.trek .. .. + zh + FAQ + .. + .. .. examples FreeBSD_version @@ -297,6 +305,8 @@ .. atm .. + bootforth + .. cvs contrib .. @@ -315,6 +325,22 @@ .. ibcs2 .. + isdn + .. + kld + cdev + module + .. + test + .. + .. + syscall + module + .. + test + .. + .. + .. libvgl .. lkm @@ -337,6 +363,8 @@ .. perfmon .. + portal + .. ppi .. printing @@ -401,42 +429,76 @@ locale da_DK.ISO_8859-1 .. + da_DK.DIS_8859-15 + .. de_AT.ISO_8859-1 .. + de_AT.DIS_8859-15 + .. de_CH.ISO_8859-1 .. + de_CH.DIS_8859-15 + .. de_DE.ISO_8859-1 .. + de_DE.DIS_8859-15 + .. en_AU.ISO_8859-1 .. + en_AU.DIS_8859-15 + .. en_CA.ISO_8859-1 .. + en_CA.DIS_8859-15 + .. en_GB.ISO_8859-1 .. + en_GB.DIS_8859-15 + .. en_US.ISO_8859-1 .. + en_US.DIS_8859-15 + .. es_ES.ISO_8859-1 .. + es_ES.DIS_8859-15 + .. fi_FI.ISO_8859-1 .. + fi_FI.DIS_8859-15 + .. fr_BE.ISO_8859-1 .. + fr_BE.DIS_8859-15 + .. fr_CA.ISO_8859-1 .. + fr_CA.DIS_8859-15 + .. fr_CH.ISO_8859-1 .. + fr_CH.DIS_8859-15 + .. fr_FR.ISO_8859-1 .. + fr_FR.DIS_8859-15 + .. hr_HR.ISO_8859-2 .. hu_HU.ISO_8859-2 .. is_IS.ISO_8859-1 .. + is_IS.DIS_8859-15 + .. it_CH.ISO_8859-1 .. + it_CH.DIS_8859-15 + .. it_IT.ISO_8859-1 .. + it_IT.DIS_8859-15 + .. ja_JP.EUC .. ja_JP.SJIS @@ -449,16 +511,26 @@ .. lt_LN.ISO_8859-2 .. + lt_LN.DIS_8859-15 + .. nl_BE.ISO_8859-1 .. + nl_BE.DIS_8859-15 + .. nl_NL.ISO_8859-1 .. + nl_NL.DIS_8859-15 + .. no_NO.ISO_8859-1 .. + no_NO.DIS_8859-15 + .. pl_PL.ISO_8859-2 .. pt_PT.ISO_8859-1 .. + pt_PT.DIS_8859-15 + .. ru_SU.CP866 .. ru_SU.KOI8-R @@ -467,6 +539,8 @@ .. sv_SE.ISO_8859-1 .. + sv_SE.DIS_8859-15 + .. zh_CN.EUC .. zh_TW.BIG5 @@ -502,7 +576,7 @@ .. catn .. - ja uname=root gname=wheel + ja uname=root cat1 .. cat2 @@ -638,6 +712,8 @@ lt_LN.ISO_8859-1 .. lt_LN.ISO_8859-2 + .. + lt_LN.DIS_8859-15 .. nl_BE.ISO_8859-1 .. diff -ur 3.0-RELEASE/etc/mtree/BSD.var.dist 3.1-RELEASE/etc/mtree/BSD.var.dist --- 3.0-RELEASE/etc/mtree/BSD.var.dist Thu Feb 18 17:15:33 1999 +++ 3.1-RELEASE/etc/mtree/BSD.var.dist Mon Feb 15 19:45:43 1999 @@ -1,4 +1,4 @@ -# $Id: BSD.var.dist,v 1.37 1998/09/19 18:50:27 obrien Exp $ +# $Id: BSD.var.dist,v 1.38 1998/12/16 05:50:25 peter Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -21,7 +21,7 @@ tabs .. .. - db uname=root gname=wheel mode=0755 + db mode=0755 .. /set type=dir uname=root gname=wheel mode=0755 games gname=games mode=0775 @@ -34,9 +34,10 @@ phantasia gname=games mode=0775 .. .. +/set type=dir uname=root gname=wheel mode=0755 log .. - mail uname=root gname=mail mode=0775 + mail gname=mail mode=0775 .. msgs uname=daemon .. @@ -44,20 +45,20 @@ .. run .. - rwho uname=root gname=daemon mode=0775 +/set type=dir uname=root gname=daemon mode=0755 + rwho gname=daemon mode=0775 .. -/set type=dir uname=uucp gname=daemon mode=0755 - spool uname=root gname=wheel - lock gname=dialer mode=0775 + spool gname=wheel + lock uname=uucp gname=dialer mode=0775 .. - lpd uname=root + lpd .. - mqueue uname=root + mqueue .. - opielocks uname=root mode=0700 + opielocks mode=0700 .. - output uname=root - lpd uname=root gname=daemon + output + lpd .. .. /set type=dir uname=uucp gname=uucp mode=0775 @@ -81,6 +82,7 @@ vi.recover .. .. - yp mode=0755 +/set type=dir uname=root gname=wheel mode=0755 + yp .. .. diff -ur 3.0-RELEASE/etc/namedb/named.conf 3.1-RELEASE/etc/namedb/named.conf --- 3.0-RELEASE/etc/namedb/named.conf Thu Feb 18 17:15:33 1999 +++ 3.1-RELEASE/etc/namedb/named.conf Mon Feb 15 19:45:43 1999 @@ -1,4 +1,4 @@ -// $Id: named.conf,v 1.2 1998/05/11 11:26:28 peter Exp $ +// $Id: named.conf,v 1.5 1998/12/23 06:06:13 dillon Exp $ // // Refer to the named(8) man page for details. If you are ever going // to setup a primary server, make sure you've understood the hairy @@ -31,6 +31,12 @@ * port by default. */ // query-source address * port 53; + + /* + * If running in a sandbox, you may have to specify a different + * location for the dumpfile. + */ + // dump-file "s/named_dump.db"; }; // Note: the following will be supported in a future release. @@ -77,11 +83,19 @@ // // NB: Don't blindly enable the examples below. :-) Use actual names // and addresses instead. +// +// NOTE!!! FreeBSD runs bind in a sandbox (see named_flags in rc.conf). +// The directory containing the secondary zones must be write accessible +// to bind. The following sequence is suggested: +// +// mkdir /etc/namedb/s +// chown bind.bind /etc/namedb/s +// chmod 750 /etc/namedb/s /* zone "domain.com" { type slave; - file "domain.com.bak"; + file "s/domain.com.bak"; masters { 192.168.1.1; }; @@ -89,7 +103,7 @@ zone "0.168.192.in-addr.arpa" { type slave; - file "0.168.192.in-addr.arpa.bak"; + file "s/0.168.192.in-addr.arpa.bak"; masters { 192.168.1.1; }; diff -ur 3.0-RELEASE/etc/netstart 3.1-RELEASE/etc/netstart --- 3.0-RELEASE/etc/netstart Thu Feb 18 17:15:17 1999 +++ 3.1-RELEASE/etc/netstart Mon Feb 15 19:45:33 1999 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: netstart,v 1.52 1997/07/05 19:35:45 pst Exp $ +# $Id: netstart,v 1.52.2.1 1999/02/10 18:08:38 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # This file is NOT called by any of the other scripts - it has been @@ -10,7 +10,9 @@ # # If there is a global system configuration file, suck it in. -if [ -f /etc/rc.conf ]; then +if [ -f /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf +elif [ -f /etc/rc.conf ]; then . /etc/rc.conf fi Only in 3.1-RELEASE/etc: objformat Only in 3.1-RELEASE/etc: pam.conf diff -ur 3.0-RELEASE/etc/passwd 3.1-RELEASE/etc/passwd --- 3.0-RELEASE/etc/passwd Thu Feb 18 17:15:19 1999 +++ 3.1-RELEASE/etc/passwd Mon Feb 15 19:45:34 1999 @@ -1,11 +1,14 @@ root:*:0:0:Charlie &:/root:/bin/csh toor:*:0:0:Bourne-again Superuser:/root: daemon:*:1:1:Owner of many system processes:/root:/sbin/nologin -operator:*:2:5:System &:/usr/guest/operator:/bin/csh +operator:*:2:5:System &:/:/sbin/nologin bin:*:3:7:Binaries Commands and Source,,,:/:/sbin/nologin +tty:*:4:65533:Tty Sandbox:/:/sbin/nologin +kmem:*:5:65533:KMem Sandbox:/:/sbin/nologin games:*:7:13:Games pseudo-user:/usr/games:/sbin/nologin news:*:8:8:News Subsystem:/:/sbin/nologin man:*:9:9:Mister Man Pages:/usr/share/man:/sbin/nologin +bind:*:53:53:Bind Sandbox:/:/sbin/nologin uucp:*:66:66:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico xten:*:67:67:X-10 daemon:/usr/local/xten:/sbin/nologin pop:*:68:6:Post Office Owner:/nonexistent:/sbin/nologin diff -ur 3.0-RELEASE/etc/pccard.conf.sample 3.1-RELEASE/etc/pccard.conf.sample --- 3.0-RELEASE/etc/pccard.conf.sample Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/pccard.conf.sample Mon Feb 15 19:45:33 1999 @@ -8,7 +8,7 @@ # IRQ == 0 means "allocate free IRQ from IRQ pool" # IRQ == 16 means "do not use IRQ (e.g. PIO mode)" # -# $Id: pccard.conf.sample,v 1.23 1998/09/25 22:08:53 brian Exp $ +# $Id: pccard.conf.sample,v 1.24.2.1 1999/02/05 09:42:27 markm Exp $ # Generally available IO ports io 0x240-0x360 @@ -80,7 +80,7 @@ # Linksys Combo PCMCIA EthernetCard (model EC2T on box) card "Linksys" "Combo PCMCIA EthernetCard (EC" - config 0x1 "ed0" ? + config 0x1 "ed0" 10 insert echo Linksys Ethernet inserted insert /etc/pccard_ether ed0 remove echo Linksys Ethernet removed @@ -340,6 +340,18 @@ insert echo NTT DoCoMo DATA/FAX Adapter inserted remove echo NTT DoCoMo DATA/FAX Adapter removed +# Random modem bundled with Dell systems +card "Psion Dacom" "Gold Card Global 56K+Fax" + config 0x23 "sio2" 10 + insert echo "Psion Dacom modem card inserted" + remove echo "Psion Dacom modem card removed" + +# Actiontec Datalink with v.90 upgrade +card "PCMCIA " "56K V.90 Fax Modem (LK) " + config 0x1f "sio2" 10 + insert echo "Actiontec Datalink modem card inserted" + remove echo "Actiontec Datalink modem card removed" + # Panasonic FM-RADIO card #card "Panasonic" "CF-JVR101" # config 0x22 "sio3" 16 @@ -387,3 +399,7 @@ # config 0x3a "spc0" 11 # insert echo REX-5535 SCSI card inserted # remove echo REX-5535 SCSI card removed + +# Libretto Floppy disk +card "Y-E DATA" "External FDD" + config 0x4 "fdc0" 10 diff -ur 3.0-RELEASE/etc/pccard_ether 3.1-RELEASE/etc/pccard_ether --- 3.0-RELEASE/etc/pccard_ether Thu Feb 18 17:15:17 1999 +++ 3.1-RELEASE/etc/pccard_ether Mon Feb 15 19:45:33 1999 @@ -1,14 +1,16 @@ #!/bin/sh - # -# $Id: pccard_ether,v 1.9 1998/09/02 01:34:56 brian Exp $ +# $Id: pccard_ether,v 1.9.2.1 1999/02/10 18:08:38 jkh Exp $ # # pccard_ether interfacename [ifconfig option] # # example: pccard_ether ep0 -link0 # -# Suck in the /etc/rc.conf variables -if [ -f /etc/rc.conf ]; then +# Suck in the configuration variables +if [ -f /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf +elif [ -f /etc/rc.conf ]; then . /etc/rc.conf fi diff -ur 3.0-RELEASE/etc/periodic/daily/340.uucp 3.1-RELEASE/etc/periodic/daily/340.uucp --- 3.0-RELEASE/etc/periodic/daily/340.uucp Thu Feb 18 17:15:17 1999 +++ 3.1-RELEASE/etc/periodic/daily/340.uucp Mon Feb 15 19:45:33 1999 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: 340.uucp,v 1.2 1997/08/17 17:55:32 pst Exp $ +# $Id: 340.uucp,v 1.3 1999/01/01 21:07:39 billf Exp $ # # Local cleanup of UUCP files. This is for backwards compatibility, # /etc/uuclean.daily doesn't exist by default. @@ -9,6 +9,6 @@ echo "" echo "Cleaning up UUCP:" - echo /etc/uuclean.daily | su daemon + echo /etc/uuclean.daily | su -m uucp fi diff -ur 3.0-RELEASE/etc/ppp/ppp.linkdown.sample 3.1-RELEASE/etc/ppp/ppp.linkdown.sample --- 3.0-RELEASE/etc/ppp/ppp.linkdown.sample Thu Feb 18 17:15:34 1999 +++ 3.1-RELEASE/etc/ppp/ppp.linkdown.sample Mon Feb 15 19:45:43 1999 @@ -12,7 +12,7 @@ # 3) If no label has been found, use MYADDR if it exists. # # -# $Id: ppp.linkdown.sample,v 1.1 1997/11/08 20:58:40 brian Exp $ +# $Id: ppp.linkdown.sample,v 1.2 1998/11/05 23:14:19 brian Exp $ # ######################################################################### @@ -24,3 +24,11 @@ # MYADDR: !bg /usr/X11R6/bin/auplay /etc/ppp/linkdown.au + +# If you're running ``ppp -auto -alias dynamic-alias-auto'', and are +# assigned a dynamic IP number by the peer, this may be worth while +# to keep the interface aliases to a minimum (see ``enable iface-alias'' +# in the man page): +# +dynamic-alias-auto: + iface clear Binary files 3.0-RELEASE/etc/pwd.db and 3.1-RELEASE/etc/pwd.db differ diff -ur 3.0-RELEASE/etc/rc 3.1-RELEASE/etc/rc --- 3.0-RELEASE/etc/rc Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/rc Mon Feb 15 19:45:33 1999 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.160 1998/10/09 17:11:14 des Exp $ +# $Id: rc,v 1.169.2.5 1999/02/13 05:31:07 jkh Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -8,7 +8,7 @@ # and the console is the controlling terminal. # Note that almost all the user-configurable behavior is no longer in -# this file, but rather in /etc/rc.conf. Please check this file +# this file, but rather in /etc/defaults/rc.conf. Please check this file # first before contemplating any changes here. stty status '^T' @@ -22,14 +22,40 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin export PATH +# BOOTP diskless boot. We have to run the rc file early in order to +# handle read-only NFS mounts, where the various config files +# in /etc often don't apply. rc.diskless typically sets skip_diskconf=YES +# on return. +# +if [ -f /etc/rc.diskless ]; then + dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` + if [ ${dlv:=0} != 0 ]; then + . /etc/rc.diskless + fi +fi + +# If there is a global system configuration file, suck it in. +# +if [ -f /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf +elif [ -f /etc/rc.conf ]; then + . /etc/rc.conf +fi + # Configure ccd devices. -if [ -f /etc/ccd.conf ]; then +if [ "X$skip_diskconf" != "XYES" -a -f /etc/ccd.conf ]; then ccdconfig -C fi -swapon -a +if [ "X$skip_diskconf" != "XYES" -a -n "$vinum_drives" ]; then + vinum read $vinum_drives +fi -if [ $1x = autobootx ]; then +if [ "X$skip_diskconf" != "XYES" ]; then + swapon -a +fi + +if [ "X$skip_diskconf" != "XYES" -a $1x = autobootx ]; then echo Automatic reboot in progress... fsck -p case $? in @@ -66,33 +92,35 @@ trap "echo 'Reboot interrupted'; exit 1" 3 -# root must be read/write both for NFS diskless and for VFS LKMs before -# proceeding any further. -mount -u -o rw / -if [ $? != 0 ]; then - echo "Filesystem mount failed, startup aborted" - exit 1 -fi +# root normally must be read/write, but if this is a BOOTP NFS +# diskless boot it does not have to be. +# -umount -a >/dev/null 2>&1 - -mount -a -t nonfs -if [ $? != 0 ]; then - echo "Filesystem mount failed, startup aborted" - exit 1 -fi +if [ "X$skip_diskconf" != "XYES" ]; then + mount -u -o rw / -# If there is a global system configuration file, suck it in. -if [ -f /etc/rc.conf ]; then - . /etc/rc.conf + if [ $? != 0 ]; then + echo "Filesystem mount failed, startup aborted" + exit 1 + fi + + umount -a >/dev/null 2>&1 + + mount -a -t nonfs + if [ $? != 0 ]; then + echo "Filesystem mount failed, startup aborted" + exit 1 + fi fi -# If old file exists, whine until they fix it. -if [ -f /etc/sysconfig ]; then - echo "Warning: /etc/sysconfig has been replaced by /etc/rc.conf." - echo "You should switch to /etc/rc.conf ASAP to eliminate this warning." +# Run custom disk mounting function here +# + +if [ "X$diskless_mount_func" != "X" ]; then + $diskless_mount_func fi + adjkerntz -i clean_var() { @@ -145,8 +173,6 @@ chmod 666 /dev/tty[pqrsPQRS]* # clean up left-over files -rm -f /etc/nologin - clean_var # If it hasn't already been done rm /var/run/clean_var @@ -172,9 +198,8 @@ # after a system crash. rm -f /tmp/.X*-lock /tmp/.X11-unix/* -# snapshot any kernel -c changes back to disk -echo 'recording kernel -c changes' -dset -q +# snapshot any kernel -c changes back to disk here +# this has changed with ELF and /kernel.config. echo -n 'additional daemons:' # start system logging and name service (named needs to start before syslogd @@ -252,17 +277,19 @@ ldconfig -elf ${_LDC} fi - # Default the a.out ldconfig path, in case the system's - # /etc/rc.conf hasn't been updated. - : ${ldconfig_paths_aout=${ldconfig_paths}} - _LDC=/usr/lib/aout - for i in $ldconfig_paths_aout; do - if test -d $i; then - _LDC="${_LDC} $i" - fi - done - echo 'setting a.out ldconfig path:' ${_LDC} - ldconfig -aout ${_LDC} + # Legacy aout support for i386 only + if [ X"`sysctl -n hw.machine`" = X"i386" ]; then + # Default the a.out ldconfig path. + : ${ldconfig_paths_aout=${ldconfig_paths}} + _LDC=/usr/lib/aout + for i in $ldconfig_paths_aout; do + if test -d $i; then + _LDC="${_LDC} $i" + fi + done + echo 'setting a.out ldconfig path:' ${_LDC} + ldconfig -aout ${_LDC} + fi fi # Now start up miscellaneous daemons that don't belong anywhere else @@ -284,6 +311,10 @@ echo -n ' sendmail'; /usr/sbin/sendmail ${sendmail_flags} fi +if [ "X${usbd_enable}" = X"YES" ]; then + echo -n ' usbd'; /usr/sbin/usbd ${usbd_flags} +fi + echo '.' # configure implementation specific stuff @@ -349,11 +380,38 @@ echo . fi +if [ "X${update_motd}" != X"NO" ]; then + T=/tmp/_motd + rm -f $T + uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > $T + awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> $T + cp $T /etc/motd + chmod 644 /etc/motd + rm -f $T +fi + # Run rc.devfs if present to customify devfs [ -f /etc/rc.devfs ] && sh /etc/rc.devfs -# Do traditional (but rather obsolete) rc.local file if it exists. -[ -f /etc/rc.local ] && sh /etc/rc.local +# Do traditional (but rather obsolete) rc.local file if it exists. If you +# use this file and want to make it programmatic, source /etc/defaults/rc.conf +# in /etc/rc.local and add your custom variables to /etc/rc.conf, as +# shown below. Please do not put local extensions into /etc/rc itself. +# Use /etc/rc.local +# +# ---- rc.local ---- +# if [ -f /etc/defaults/rc.conf ]; then +# . /etc/defaults/rc.conf +# fi +# +# ... additional startup conditionals ... +# ---- rc.local ---- +# +if [ -f /etc/rc.local ]; then + echo -n 'starting local daemons:' + sh /etc/rc.local + echo '.' +fi # Raise kernel security level. This should be done only after `fsck' has # repaired local file systems if you want the securelevel to be greater than 1. Only in 3.0-RELEASE/etc: rc.conf diff -ur 3.0-RELEASE/etc/rc.devfs 3.1-RELEASE/etc/rc.devfs --- 3.0-RELEASE/etc/rc.devfs Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/rc.devfs Mon Feb 15 19:45:33 1999 @@ -1,8 +1,10 @@ # -# $Id: rc.devfs,v 1.3 1998/10/13 08:25:09 jkh Exp $ +# $Id: rc.devfs,v 1.3.2.1 1999/02/10 18:08:38 jkh Exp $ # # If there is a global system configuration file, suck it in. -if [ -f /etc/rc.conf ]; then +if [ -f /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf +elif [ -f /etc/rc.conf ]; then . /etc/rc.conf fi diff -ur 3.0-RELEASE/etc/rc.firewall 3.1-RELEASE/etc/rc.firewall --- 3.0-RELEASE/etc/rc.firewall Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/rc.firewall Mon Feb 15 19:45:33 1999 @@ -1,8 +1,11 @@ ############ # Setup system for firewall service. -# $Id: rc.firewall,v 1.19 1998/04/25 00:40:55 alex Exp $ +# $Id: rc.firewall,v 1.19.2.1 1999/02/10 18:08:38 jkh Exp $ -if [ -f /etc/rc.conf ]; then +# Suck in the configuration variables. +if [ -f /etc/defaults/rc.conf ]; then + . /etc/defaults/rc.conf +elif [ -f /etc/rc.conf ]; then . /etc/rc.conf fi diff -ur 3.0-RELEASE/etc/rc.i386 3.1-RELEASE/etc/rc.i386 --- 3.0-RELEASE/etc/rc.i386 Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/rc.i386 Mon Feb 15 19:45:33 1999 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.35 1998/07/22 05:38:58 phk Exp $ +# $Id: rc.i386,v 1.37.2.1 1999/01/31 12:59:09 yokota Exp $ # Do i386 specific processing # @@ -94,8 +94,10 @@ # screen saver if [ "X${saver}" != X"NO" ] ; then echo -n ' screensaver' - modstat | grep -q _saver || \ - modload -u -o /tmp/saver_mod -q /lkm/${saver}_saver_mod.o + for i in `kldstat | awk '$5 ~ "^splash_.*$" { print $5 }'`; do + kldunload $i + done + kldstat -v | grep -q _saver || kldload ${saver}_saver fi # mouse daemon Only in 3.1-RELEASE/etc: rc.isdn Only in 3.0-RELEASE/etc: rc.local diff -ur 3.0-RELEASE/etc/rc.network 3.1-RELEASE/etc/rc.network --- 3.0-RELEASE/etc/rc.network Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/rc.network Mon Feb 15 19:45:33 1999 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.33 1998/10/06 19:24:14 phk Exp $ +# $Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -31,6 +31,25 @@ atm_pass1 fi + # ISDN subsystem startup + if [ "X${isdn_enable}" = X"YES" -a -f /etc/rc.isdn ]; then + . /etc/rc.isdn + fi + + # Special options for sppp(4) interfaces go here. These need + # to go _before_ the general ifconfig section, since in the case + # of hardwired (no link1 flag) but required authentication, you + # cannot pass auth parameters down to the already running interface. + for ifn in ${sppp_interfaces}; do + eval spppcontrol_args=\$spppconfig_${ifn} + if [ -n "${spppcontrol_args}" ] ; then + # The auth secrets might contain spaces; in order + # to retain the quotation, we need to eval them + # here. + eval spppcontrol ${ifn} ${spppcontrol_args} + fi + done + # Set up all the network interfaces, calling startup scripts if needed for ifn in ${network_interfaces}; do if [ -e /etc/start_if.${ifn} ]; then @@ -71,7 +90,7 @@ fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then - if modload /lkm/ipfw_mod.o; then + if kldload ipfw; then firewall_in_kernel=1 # module loaded successfully echo "Kernel firewall module loaded." else @@ -258,6 +277,10 @@ if [ "X${nfs_client_enable}" = X"YES" ]; then echo -n ' nfsiod'; nfsiod ${nfs_client_flags} + if [ "X${nfs_access_cache}" != X ]; then + sysctl -w vfs.nfs.access_cache_timeout=${nfs_access_cache} \ + >/dev/null 2>&1 + fi fi if [ "X${amd_enable}" = X"YES" ]; then @@ -269,7 +292,7 @@ fi if [ "X${rwhod_enable}" = X"YES" ]; then - echo -n ' rwhod'; rwhod + echo -n ' rwhod'; rwhod ${rwhod_flags} fi # Kerberos runs ONLY on the Kerberos server machine diff -ur 3.0-RELEASE/etc/rc.pccard 3.1-RELEASE/etc/rc.pccard --- 3.0-RELEASE/etc/rc.pccard Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/rc.pccard Mon Feb 15 19:45:33 1999 @@ -3,10 +3,13 @@ # PC-card startup script # HOSOKAWA, Tatsumi # -# $Id: rc.pccard,v 1.6 1998/08/10 19:54:12 brian Exp $ +# $Id: rc.pccard,v 1.6.2.1 1999/02/05 09:42:27 markm Exp $ # if [ "X$pccard_enable" = X"YES" ] ; then + if kldload pcic; then + echo "Kernel pcic module loaded." + fi if [ "x$pccard_mem" != "xDEFAULT" ] ; then pccardc pccardmem $pccard_mem else diff -ur 3.0-RELEASE/etc/security 3.1-RELEASE/etc/security --- 3.0-RELEASE/etc/security Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/security Mon Feb 15 19:45:33 1999 @@ -1,7 +1,7 @@ #!/bin/sh - # # @(#)security 5.3 (Berkeley) 5/28/91 -# $Id: security,v 1.27 1998/08/16 10:38:02 des Exp $ +# $Id: security,v 1.29 1999/01/10 11:18:59 danny Exp $ # PATH=/sbin:/bin:/usr/bin LC_ALL=C; export LC_ALL @@ -11,7 +11,7 @@ echo "" } -host=`hostname -s` +host=`hostname` echo "Subject: $host security check output" LOG=/var/log @@ -103,7 +103,7 @@ # show login failures separator echo "$host login failures:" -grep -i "login failures" $LOG/messages +grep -i "login failure" $LOG/messages # show tcp_wrapper warning messages separator diff -ur 3.0-RELEASE/etc/sendmail.cf 3.1-RELEASE/etc/sendmail.cf --- 3.0-RELEASE/etc/sendmail.cf Thu Feb 18 17:15:19 1999 +++ 3.1-RELEASE/etc/sendmail.cf Mon Feb 15 19:45:34 1999 @@ -15,30 +15,40 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by root@polarstar.ssr.bisd.hitachi.co.jp on Tue Oct 20 17:20:13 GMT 1998 +##### built by root@usw3.freebsd.org on Mon Feb 15 10:13:25 GMT 1999 ##### in /usr/src/etc/sendmail ##### using /usr/src/etc/sendmail/../../contrib/sendmail/cf/ as configuration include directory ##### ###################################################################### ###################################################################### -##### @(#)cfhead.m4 8.22 (Berkeley) 5/19/98 ##### -##### @(#)cf.m4 8.29 (Berkeley) 5/19/98 ##### -##### @(#)freebsd.mc $Revision: 1.3 $ ##### +##### @(#)cfhead.m4 8.23 (Berkeley) 10/6/1998 ##### +##### @(#)cf.m4 8.29 (Berkeley) 5/19/1998 ##### +##### @(#)freebsd.mc $Revision: 1.4 $ ##### -##### @(#)bsd4.4.m4 8.9 (Berkeley) 5/19/98 ##### +##### @(#)bsd4.4.m4 8.10 (Berkeley) 10/6/1998 ##### -##### @(#)generic.m4 8.9 (Berkeley) 5/19/98 ##### +##### @(#)generic.m4 8.9 (Berkeley) 5/19/1998 ##### -##### @(#)redirect.m4 8.10 (Berkeley) 5/19/98 ##### +##### @(#)redirect.m4 8.10 (Berkeley) 5/19/1998 ##### -##### @(#)use_cw_file.m4 8.6 (Berkeley) 5/19/98 ##### +##### @(#)use_cw_file.m4 8.6 (Berkeley) 5/19/1998 ##### -##### @(#)mailertable.m4 8.9 (Berkeley) 5/19/98 ##### +##### @(#)relay_based_on_MX.m4 8.7 (Berkeley) 5/19/1998 ##### +##### @(#)mailertable.m4 8.10 (Berkeley) 10/6/1998 ##### -##### @(#)proto.m4 8.223 (Berkeley) 6/30/98 ##### +##### @(#)access_db.m4 8.8 (Berkeley) 5/19/1998 ##### + +##### @(#)blacklist_recipients.m4 8.9 (Berkeley) 5/19/1998 ##### + +##### @(#)virtusertable.m4 8.8 (Berkeley) 10/6/1998 ##### + +##### @(#)local_lmtp.m4 8.5 (Berkeley) 5/19/1998 ##### + + +##### @(#)proto.m4 8.237 (Berkeley) 12/17/1998 ##### # level 8 config file format @@ -54,7 +64,7 @@ Cwlocalhost # file containing names of hosts for which we receive email -Fw-o /etc/sendmail.cw +Fw-o /etc/mail/sendmail.cw # my official domain name # ... define this only if sendmail cannot automatically determine your domain @@ -63,14 +73,6 @@ CP. -# UUCP relay host -DYucbvax.Berkeley.EDU -CPUUCP - -# BITNET relay host -DBmailhost.Berkeley.EDU -CPBITNET - # "Smart" relay host (may be null) DS @@ -85,14 +87,20 @@ C[[ # Mailer table (overriding domains) -Kmailertable hash -o /etc/mailertable +Kmailertable hash -o /etc/mail/mailertable +# Virtual user table (maps incoming users) +Kvirtuser hash -o /etc/mail/virtusertable +# Access list database (for spam stomping) +Kaccess hash -o /etc/mail/access' +# MX map (to allow relaying to hosts that we MX for) +Kmxserved bestmx -z: -T # Resolve map (to check if a host exists in check_mail) Kresolve host -a -T @@ -125,7 +133,7 @@ CPREDIRECT # Configuration version number -DZ8.9.1 +DZ8.9.2 ############### @@ -337,7 +345,7 @@ #O DialDelay=10s # action to take if there are no recipients in the message -#O NoRecipientAction=add-to-undisclosed +O NoRecipientAction=add-to-undisclosed # chrooted environment for writing to files #O SafeFileEnvironment=/arch @@ -387,6 +395,13 @@ # shall we get local names from our installed interfaces? #O DontProbeInterfaces + + +# Maximum MIME header length to protect MUAs +O MaxMimeHeaderLength=256/128 + + + ########################### # Message precedences # ########################### @@ -516,8 +531,12 @@ -# pass UUCP addresses straight through -R$* < @ $+ . UUCP > $* $@ $1 < @ $2 . UUCP . > $3 +# if really UUCP, handle it immediately + +# try UUCP traffic as a local address +R$* < @ $+ . UUCP > $* $: $1 < @ $[ $2 $] . UUCP . > $3 +R$* < @ $+ . . UUCP . > $* $@ $1 < @ $2 . > $3 + # pass to name server to make hostname canonical R$* < @ $* $~P > $* $: $1 < @ $[ $2 $3 $] > $4 @@ -616,6 +635,16 @@ R$* < @ [ $+ ] > $* $: $>98 $1 < @ [ $2 ] > $3 numeric internet spec R$* < @ [ $+ ] > $* $#esmtp $@ [$2] $: $1 < @ [$2] > $3 still numeric: send +# handle virtual users +R$+ < @ $=w . > $: < $(virtuser $1 @ $2 $@ $1 $: @ $) > $1 < @ $2 . > +R<@> $+ + $* < @ $* . > + $: < $(virtuser $1 + * @ $3 $@ $1 $: @ $) > $1 + $2 < @ $3 . > +R<@> $+ + $* < @ $* . > + $: < $(virtuser $1 @ $3 $@ $1 $: @ $) > $1 + $2 < @ $3 . > +R<@> $+ < @ $+ . > $: < $(virtuser @ $2 $@ $1 $: @ $) > $1 < @ $2 . > +R<@> $+ $: $1 +R< error : $- $+ > $* $#error $@ $(dequote $1 $) $: $2 +R< $+ > $+ < @ $+ > $: $>97 $1 # short circuit local delivery so forwarded email works R$=L < @ $=w . > $#local $: @ $1 special local names @@ -631,10 +660,7 @@ # resolve remotely connected UUCP links (if any) # resolve fake top level domains by forwarding to other hosts -R$*<@$+.BITNET.>$* $: $>95 < $B > $1 <@$2.BITNET.> $3 user@host.BITNET -# forward non-local UUCP traffic to our UUCP relay -R$*<@$*.UUCP.>$* $: $>95 < $Y > $1 <@$2.UUCP.> $3 uucp mail # pass names that still have a host to a smarthost (if defined) @@ -756,6 +782,53 @@ R$* < @ $+ .REDIRECT. > < $- > $# error $@ 5.1.1 $: "551 User has moved; please try " <$1@$2> +###################################################################### +### LookUpDomain -- search for domain in access database +### +### Parameters: +### <$1> -- key (domain name) +### <$2> -- default (what to return if not found in db) +### <$3> -- passthru (additional data passed unchanged through) +###################################################################### + +SLookUpDomain +R<$+> <$+> <$*> $: < $(access $1 $: ? $) > <$1> <$2> <$3> +R <$+.$+> <$+> <$*> $@ $>LookUpDomain <$2> <$3> <$4> +R <$+> <$+> <$*> $@ <$2> <$3> +R<$*> <$+> <$+> <$*> $@ <$1> <$4> + +###################################################################### +### LookUpAddress -- search for host address in access database +### +### Parameters: +### <$1> -- key (dot quadded host address) +### <$2> -- default (what to return if not found in db) +### <$3> -- passthru (additional data passed through) +###################################################################### + +SLookUpAddress +R<$+> <$+> <$*> $: < $(access $1 $: ? $) > <$1> <$2> <$3> +R <$+.$-> <$+> <$*> $@ $>LookUpAddress <$1> <$3> <$4> +R <$+> <$+> <$*> $@ <$2> <$3> +R<$*> <$+> <$+> <$*> $@ <$1> <$4> + +###################################################################### +### CanonAddr -- Convert an address into a standard form for +### relay checking. Route address syntax is +### crudely converted into a %-hack address. +### +### Parameters: +### $1 -- full recipient address +### +### Returns: +### parsed address, not in source route form +###################################################################### + +SCanonAddr +R$* $: $>Parse0 $>3 $1 make domain canonical +R< @ $+ > : $* @ $* < @ $1 > : $2 % $3 change @ to % in src route +R$* < @ $+ > : $* : $* $3 $1 < @ $2 > : $4 change to % hack. +R$* < @ $+ > : $* $3 $1 < @ $2 > ###################################################################### ### ParseRecipient -- Strip off hosts in $=R as well as possibly @@ -770,17 +843,26 @@ ###################################################################### SParseRecipient -R$* $: $>Parse0 $>3 $1 -R $* < @ $* . > $1 < @ $2 > strip trailing dots -R $- < @ $* > $: $(dequote $1 $) < @ $2 > dequote local part +R$* $: $>CanonAddr $1 +R $* < @ $* . > $1 < @ $2 > strip trailing dots +R $- < @ $* > $: $(dequote $1 $) < @ $2 > dequote local part # if no $=O character, no host in the user portion, we are done -R $* $=O $* < @ $* > $: $1 $2 $3 < @ $4> -R $* $@ $1 +R $* $=O $* < @ $* > $: $1 $2 $3 < @ $4> +R $* $@ $1 + + +R $* < @ $+ > $: < : $(mxserved $2 $) : > < $1 < @$2 > > +R < : $* : > $* $#error $@ 4.7.1 $: "450 Can not check MX records for recipient host " $1 +R < $* : $=w. : $* > < $+ > $: $4 +R < : $* : > < $+ > $: $2 -R $* < @ $* $=R > $: $1 < @ $2 $3 > -R $* < @ $* > $@ $>ParseRecipient $1 -R<$-> $* $@ $2 +R $* < @ $* $=R > $: $1 < @ $2 $3 > +R $* < @ $+ > $: $>LookUpDomain <$2> <$1 < @ $2 >> +R<$+> <$+> $: <$1> $2 + +R $* < @ $* > $@ $>ParseRecipient $1 +R<$-> $* $@ $2 ###################################################################### ### check_relay -- check hostname/address on SMTP startup @@ -798,6 +880,14 @@ R< d > $* $@ deferred R< $* > $* $: $2 +R$+ $| $+ $: $>LookUpDomain < $1 > < $2 > +R < $+ > $: $>LookUpAddress < $1 > < $1 > +R < $+ > $: $1 +R < $* > $@ OK +R < $* > $@ RELAY +R $* $#error $@ 5.7.1 $: "550 Access denied" +R $* $#discard $: discard +R<$+> $* $#error $@ 5.7.1 $: $1 ###################################################################### @@ -817,8 +907,8 @@ R< $* > $* $: $2 R<> $@ -R$* $: $>Parse0 $>3 $1 make domain canonical -R $* < @ $+ . > $* $1 < @ $2 > $3 strip trailing dots +R$* $: $>CanonAddr $1 +R $* < @ $+ . > $1 < @ $2 > strip trailing dots # handle non-DNS hostnames (*.bitnet, *.decnet, *.uucp, etc) R $* < $* $=P > $* $: $1 < @ $2 $3 > $4 R $* < @ $+ > $* $: $) > $1 < @ $2 > $3 @@ -835,6 +925,21 @@ R <$+> $* $#error $@ 5.5.4 $: "553 Real domain name required" R <$+> $* $: <$1> $2 +# lookup localpart (user@) +R<$+> $* < @ $+ > $* $: <$1> $2 < @ $3 > $4 +# no match, try full address (user@domain rest) +R <$+> $* < @ $* > $* + $: <$1> $2 < @ $3 > $4 +# no match, try address (user@domain) +R <$+> $+ < @ $+ > $* + $: <$1> $2 < @ $3 > $4 +# no match, try (sub)domain (domain) +R <$+> $* < @ $+ > $* + $: $>LookUpDomain <$3> <$1> <> +# check unqualified user in access database +R $* $: $1 +# retransform for further use +R <$+> $* $: <$1> $3 # handle case of no @domain on address R $* $: < ? $&{client_name} > $1 @@ -846,6 +951,10 @@ R $* $@ R $* $#error $@ 4.1.8 $: "451 Sender domain must resolve" R $* $#error $@ 5.1.8 $: "501 Sender domain must exist" +R $* $@ +R $* $#discard $: discard +R $* $#error $@ 5.7.1 $: "550 Access denied" +R<$+> $* $#error $@ 5.7.1 $: $1 error from access db ###################################################################### ### check_rcpt -- check SMTP `RCPT TO:' command argument @@ -866,14 +975,39 @@ R$* $: $>ParseRecipient $1 strip relayable hosts + +# blacklist local users or any host from receiving mail +R$* $: $1 +R $+ < @ $=w > $: <> <$1 < @ $2 >> +R $+ < @ $* > $: <> <$1 < @ $2 >> +R $+ $: <> <$1> +R<> $* $: <$(access $1 $: $)> $2 +R<> $* $: <$(access $1 $: $)> $2 +R $* $: <$(access $1 $: $)> $2 +R<> $* $: <$(access $1 $: $)> $2 +R $* $: <$(access $1 $: $)> $2 +R<> <$*> $: $1 +R <$*> $: $1 +R <$*> $: $1 +R $* $#error $@ 5.2.1 $: "550 Mailbox disabled for this recipient" +R<$+> $* $#error $@ 5.2.1 $: $1 error from access db + # anything terminating locally is ok R$+ < @ $=w > $@ OK R$+ < @ $* $=R > $@ OK - +R$+ < @ $* > $: $>LookUpDomain <$2> <$1 < @ $2 >> +R $* $@ RELAY +R<$*> <$*> $: $2 + +# allow relaying for hosts which we MX serve +R$+ < @ $* > $: < : $(mxserved $2 $) : > $1 < @ $2 > +R< : $* : > $* $#error $@ 4.7.1 $: "450 Can not check MX records for recipient host " $1 +R<$* : $=w . : $*> $* $@ OK +R< : $* : > $* $: $2 # check for local user (i.e. unqualified address) R$* $: $1 -R $+ < @ $+ > $: $1 < @ $2 > +R $* < @ $+ > $: $1 < @ $2 > # local user is ok R $+ $@ OK R<$+> $* $: $2 @@ -889,12 +1023,18 @@ R$@ $@ OK R$=w $@ OK R$* $=R $@ OK +R$* $: $>LookUpDomain <$1> <$1> +R $* $@ RELAY +R<$*> <$*> $: $2 # check IP address R$* $: $&{client_addr} R$@ $@ OK originated locally R0 $@ OK originated locally R$=R $* $@ OK relayable IP address +R$* $: $>LookUpAddress <$1> <$1> +R $* $@ RELAY relayable IP address +R<$*> <$*> $: $2 R$* $: [ $1 ] put brackets around it... R$=w $@ OK ... and see if it is local @@ -916,11 +1056,11 @@ ### Local and Program Mailer specification ### ################################################## -##### @(#)local.m4 8.30 (Berkeley) 6/30/98 ##### +##### @(#)local.m4 8.30 (Berkeley) 6/30/1998 ##### -Mlocal, P=/usr/libexec/mail.local, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40, +Mlocal, P=/usr/libexec/mail.local, F=lsDFMAw5:/|@qSXfmnz9P, S=10/30, R=20/40, T=DNS/RFC822/X-Unix, - A=mail $u + A=mail.local -l Mprog, P=/bin/sh, F=lsDFMoqeu9, S=10/30, R=20/40, D=$z:/, T=X-Unix, A=sh -c $u @@ -964,7 +1104,7 @@ ### SMTP Mailer specification ### ##################################### -##### @(#)smtp.m4 8.38 (Berkeley) 5/19/98 ##### +##### @(#)smtp.m4 8.38 (Berkeley) 5/19/1998 ##### Msmtp, P=[IPC], F=mDFMuX, S=11/31, R=21, E=\r\n, L=990, T=DNS/RFC822/SMTP, Binary files 3.0-RELEASE/etc/spwd.db and 3.1-RELEASE/etc/spwd.db differ diff -ur 3.0-RELEASE/etc/ttys 3.1-RELEASE/etc/ttys --- 3.0-RELEASE/etc/ttys Thu Feb 18 17:15:16 1999 +++ 3.1-RELEASE/etc/ttys Mon Feb 15 19:45:33 1999 @@ -1,8 +1,30 @@ # -# $Id: ttys,v 1.2 1998/09/02 01:34:57 brian Exp $ +# $Id: ttys,v 1.2.2.1 1999/02/12 04:03:39 wes Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # name getty type status comments +# +# This file specifies various information about terminals on the system. +# It is used by several different programs. Common entries for the +# various columns includes: +# +# name The name of the terminal device. +# +# getty The program to start running on the terminal. Typically a +# getty program, as the name implies. Other common entries +# include none, when no getty is needed, and xdm to start the +# X Window System. +# +# type The initial terminal type for this port. For hardwired +# terminal lines, this will contain the type of terminal used. +# For virtual consoles, the correct type is cons25. Other +# common values include network for network connections on +# pseudo-terminals, dialup for incoming modem ports, and unknown +# when the terminal type cannot be predetermined. +# +# status Must be on or off. If on, init will run the getty program on +# the specified port. If the word "secure" appears, this tty +# allows root login. # # This entry needed for asking password when init goes to single-user mode # If you want to be asked for password, change "secure" to "insecure" here