diff -ur 2.2.5-RELEASE/etc/amd.map 2.2.6-RELEASE/etc/amd.map --- 2.2.5-RELEASE/etc/amd.map Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/amd.map Wed Mar 25 10:56:48 1998 @@ -1,2 +1,2 @@ /defaults type:=host;fs:=${autodir}/${rhost};rhost:=${key} -* opts:=rw,grpid,resvport,nfsv2 +* opts:=rw,grpid,resvport,nfsv2,nosuid,nodev diff -ur 2.2.5-RELEASE/etc/disktab 2.2.6-RELEASE/etc/disktab --- 2.2.5-RELEASE/etc/disktab Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/disktab Wed Mar 25 10:56:48 1998 @@ -99,6 +99,15 @@ :pc#3444:oc#0:bc#4096:fc#512: # +# LS-120 floppy-format. +# +fd120m|floppy120|floppy120m|3.5in LS-120 Floppy:\ + :ty=floppy:se#512:nt#8:rm#300:ns#32:nc#963:\ + :pa#246528:oa#0:ba#4096:fa#512:\ + :pb#246528:ob#0:bb#4096:fb#512:\ + :pc#246528:oc#0:bc#4096:fc#512: + +# # Harddisk formats # qp120at|Quantum Peripherals 120MB IDE:\ diff -ur 2.2.5-RELEASE/etc/gnats/freefall 2.2.6-RELEASE/etc/gnats/freefall --- 2.2.5-RELEASE/etc/gnats/freefall Tue Oct 21 23:21:09 1997 +++ 2.2.6-RELEASE/etc/gnats/freefall Wed Mar 25 10:56:48 1998 @@ -6,3 +6,4 @@ kern misc ports +sparc diff -ur 2.2.5-RELEASE/etc/locate.rc 2.2.6-RELEASE/etc/locate.rc --- 2.2.5-RELEASE/etc/locate.rc Tue Oct 21 23:21:09 1997 +++ 2.2.6-RELEASE/etc/locate.rc Wed Mar 25 10:56:48 1998 @@ -1,7 +1,7 @@ # # /etc/locate.rc - command script for updatedb(8) # -# $Id: locate.rc,v 1.2 1996/09/05 20:18:14 guido Exp $ +# $Id: locate.rc,v 1.2.2.1 1998/03/08 09:31:57 jkh Exp $ # # All commented values are the defaults @@ -22,5 +22,5 @@ # and if the SEARCHPATHS starts in such a filesystem locate will build # an empty database. # -# be carefully if you add 'nfs' +# be careful if you add 'nfs' #FILESYSTEMS="ufs" diff -ur 2.2.5-RELEASE/etc/login.conf 2.2.6-RELEASE/etc/login.conf --- 2.2.5-RELEASE/etc/login.conf Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/login.conf Wed Mar 25 10:56:48 1998 @@ -9,7 +9,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $Id: login.conf,v 1.9.2.3 1997/05/23 12:59:16 ache Exp $ +# $Id: login.conf,v 1.9.2.7 1998/03/09 03:03:23 steve Exp $ # @@ -20,7 +20,7 @@ auth-root-defaults:\ :auth-login=krb_skey_or_passwd,passwd,kerberos,skey:\ - :auth-rlogin=krb_or_skey,kerberos,skey:\ + :auth-rlogin=krb_or_skey,kerberos,skey: auth-ftp-defaults:\ :auth=skey_or_pwd,passwd,skey: @@ -32,7 +32,7 @@ default:\ :cputime=infinity:\ - :datasize-cur=16M:\ + :datasize-cur=22M:\ :stacksize-cur=8M:\ :memorylocked-cur=10M:\ :memoryuse-cur=30M:\ @@ -121,22 +121,25 @@ :priority=0:\ :requirehome@:\ :umask=022:\ - :tc=auth-root-defaults:\ + :tc=auth-root-defaults: # # Settings used by /etc/rc # daemon:\ - :coredumpsize=0:\ - :datasize=32M:\ - :maxproc=256:\ + :coredumpsize@:\ + :coredumpsize-cur=0:\ + :datasize=infinity:\ + :datasize-cur@:\ + :maxproc=512:\ :maxproc-cur@:\ :memoryuse-cur=64M:\ :memorylocked-cur=64M:\ :openfiles=1024:\ :openfiles-cur@:\ :stacksize=16M:\ + :stacksize-cur@:\ :tc=default: @@ -147,7 +150,7 @@ :path=/usr/local/news/bin /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin:\ :cputime=infinity:\ :filesize=128M:\ - :datasize-curr=64M:\ + :datasize-cur=64M:\ :stacksize-cur=32M:\ :coredumpsize-cur=0:\ :maxmemorysize-cur=128M:\ @@ -189,7 +192,7 @@ :autodelete@:\ :expireperiod@:\ :graceexpire@:\ - ;gracetime@:\ + :gracetime@:\ :warnexpire@:\ :warnpassword@:\ :idletime@:\ diff -ur 2.2.5-RELEASE/etc/mail/Makefile 2.2.6-RELEASE/etc/mail/Makefile --- 2.2.5-RELEASE/etc/mail/Makefile Tue Oct 21 23:21:31 1997 +++ 2.2.6-RELEASE/etc/mail/Makefile Wed Mar 25 10:57:03 1998 @@ -3,25 +3,39 @@ mv -f /etc/mail/ips.txt /etc/mail/ips.txt.0 .endif fetch ftp://ftp.gulf.net/pub/docs/ips.txt - cat /etc/mail/ips.txt | cut -d ' ' -f 1 | \ + sort ips.txt > block_ips.txt + touch allowsorted_ips.txt +.if exists(/etc/mail/allow_ips.txt) + sort allow_ips.txt > allowsorted_ips.txt +.endif + comm -23 block_ips.txt allowsorted_ips.txt | \ + cut -d ' ' -f 1 | \ sed -e 's/$$/ #blocked. contact postmaster/' > \ - /etc/mail/ips.new - mv /etc/mail/ips.new /etc/mail/ips.txt + /etc/mail/block_ips.new + rm allowsorted_ips.txt + mv /etc/mail/block_ips.new /etc/mail/block_ips.txt .if exists(/etc/mail/domains.txt) mv -f /etc/mail/domains.txt /etc/mail/domains.txt.0 .endif fetch ftp://ftp.gulf.net/pub/docs/domains.txt - cat /etc/mail/domains.txt | cut -d ' ' -f 1 | \ + sort domains.txt > block_domains.txt + touch allowsorted_domains.txt +.if exists(/etc/mail/allow_domains.txt) + sort allow_domains.txt > allowsorted_domains.txt +.endif + comm -23 block_domains.txt allowsorted_domains.txt | \ + cut -d ' ' -f 1 | \ sed -e 's/$$/ #blocked. contact postmaster/' > \ - /etc/mail/domains.new - mv /etc/mail/domains.new /etc/mail/domains.txt + /etc/mail/block_domains.new + rm allowsorted_domains.txt + mv /etc/mail/block_domains.new /etc/mail/block_domains.txt install: - makemap hash /etc/mail/spamsites < /etc/mail/domains.txt + makemap hash /etc/mail/spamsites < /etc/mail/block_domains.txt .if exists(/etc/mail/spamsites.local) makemap -o hash /etc/mail/spamsites < /etc/mail/spamsites.local .endif - makemap hash /etc/mail/denyip < /etc/mail/ips.txt + makemap hash /etc/mail/denyip < /etc/mail/block_ips.txt .if exists(/etc/mail/denyip.local) makemap -o hash /etc/mail/denyip < /etc/mail/denyip.local .endif diff -ur 2.2.5-RELEASE/etc/mail/README 2.2.6-RELEASE/etc/mail/README --- 2.2.5-RELEASE/etc/mail/README Tue Oct 21 23:21:31 1997 +++ 2.2.6-RELEASE/etc/mail/README Wed Mar 25 10:57:03 1998 @@ -3,12 +3,14 @@ Introduction: The FreeBSD Project filters spam, unsolicited commerical e-mail, from its mailing lists. The filter has two parts: databases -and rulesets. We have added three rulesets to /etc/sendmail.cf, -check_relay and check_mail and xlat. (xlat is for testing only, as -explained in /etc/mail/sendmail.cf.additions.) These rulesets use -two databases. The denyip, a list of IP addresses, and spamsites, -a list of domains. We do not accept mail from any machine that -matches a entry in either database. +and rulesets. We have rulesets to /etc/sendmail.cf, check_rcpt, +check_relay, check_rbl, check_mail and xlat. (xlat is for testing +only, as explained in /etc/mail/sendmail.cf.additions.) These +rulesets use three databases. The denyip, a list of IP addresses, +spamsites, a list of domains, and fakenames, a list of bogus +usernames (such as investor and success). We do not accept mail +from any machine that matches a entry in either database, or users +in the fakenames database. Filtering at your site: To filter spam at your site you need to: @@ -55,11 +57,24 @@ these two log entries: Check_mail rejects: -"Oct 15 02:43:26 hub sendmail[6565]: CAA06565: ruleset=check_mail, +Oct 15 02:43:26 hub sendmail[6565]: CAA06565: ruleset=check_mail, arg1=, relay=xxx.isp.net [###.###.###.###], -reject=521 " +reject=521 + +Nov 30 15:56:37 hub sendmail[15058]: PAA15058: ruleset=check_mail, +arg1=, relay=relay.somewhere.com +[###.###.###.###], reject=451 ... Domain +does not resolve + Check_relay rejects: Oct 19 04:45:24 hub sendmail[3503]: NOQUEUE: ruleset=check_relay, arg1=imsp015.netvigator.com, arg2=205.252.144.206, relay=root@localhost, reject=521 blocked.contact postmaster@FreeBSD.ORG + +check_rcpt reject: +Nov 30 15:04:08 hub sendmail[12390]: PAA12390: ruleset=check_rcpt, +arg1=investor@100percent.per.year.com, relay=newfed.frb.gov +[198.3.221.5], reject=553 investor@100percent.per.year.com... +521#blocked.contact postmaster +Sun Nov 16 11:40:53 PST 1997 diff -ur 2.2.5-RELEASE/etc/mail/sendmail.cf.additions 2.2.6-RELEASE/etc/mail/sendmail.cf.additions --- 2.2.5-RELEASE/etc/mail/sendmail.cf.additions Tue Oct 21 23:21:31 1997 +++ 2.2.6-RELEASE/etc/mail/sendmail.cf.additions Wed Mar 25 10:57:03 1998 @@ -1,40 +1,114 @@ +# list of hosts and domains for whom we relay mail. +# all .forward hosts, domains must be listed in this file. +# same for hosts and domains in /etc/aliases +FR-o /etc/sendmail.cR + # database declarations Kdenyip hash -o -a.REJECT /etc/mail/denyip.db +Kfakenames hash -o -a.REJECT /etc/mail/fakenames.db Kspamsites hash -o -a.REJECT /etc/mail/spamsites.db -# called with host.tld and IP address of connecting host. -# ip address must NOT be in the "denyip" database +# helper rulsesets; useful for debugging sendmail configurations +# +# +Scheck_rbl +# lookup up an ip address in the Realtime Blackhole List. +R$-.$-.$-.$- $: $(host $4.$3.$2.$1.rbl.maps.vix.com $:OK $) + +Sxlat # for sendmail -bt +# sendmail treats "$" and "|" as two distinct tokens +# this rule "pastes" them together into one token +# and then calls check_relay. +R$* $$| $* $: $1 $| $2 +R$* $| $* $@ $>check_relay $1 $| $2 + Scheck_relay -R$* $| [$+ $1 $| $2 should not be needed -R$* $| $+] $1 $| $2 same (bat 2nd ed p510) +# called with "hostname.tld $| IP address" of connecting host. +# hostname.tld is the fully-qualified domain name +# IP address is dotted-quad with surrounding "[]" brackets. +# +# each group of rules in this ruleset is independent. +# each accepts and return "hostname.tld $| IP address" +# use the ones that you want comment out the rest +# you may rearrange the groups but not the rules in each group. +# each group is preceded and followed by a comment +# +# host must NOT be in the "spamsites" database--BEGIN +R$* $| $* $: <$1 $| $2> $1 +R<$*> $+.$+.$+ <$1> $3.$4 +R<$*> $+.$+ $: <$1> $(spamsites $2.$3 $) +R<$*> $*.REJECT $#error $: 521 blocked. contact postmaster@$m +R<$*> $* $: $1 +# host must NOT be in the "spamsites" database--END +# ip address must NOT be in the "denyip" database--BEGIN R$* $| $* $: $1 $| $(denyip $2 $) -R$* $| $*.REJECT $#error $: 521 blocked. contact postmaster@FreeBSD.ORG ($2) -# host must *not* be in the "spamsites" database -R$+.$+.$+ $| $* $2.$3 $| $4 -R$+.$+ $| $* $: $(spamsites $1.$2 $) $| $3 -R$*.REJECT $| $* $#error $: 521 blocked. contact postmaster@FreeBSD.ORG ($1) -# Host must be resolvable, currently not used at hub.freebsd.org -#R$* $| $* $: <$1 $| $2> $>3 foo@$1 -#R <$*> $*<@$*.> $: $1 -#R <$*> $*<@$*> $#error $: 451 Domain does not resolve ($1) +R$* $| $*.REJECT $#error $: 521 blocked. contact postmaster@$m +# ip address must NOT be in the "denyip" database--END +R$* $@ OK -# called with envelope sender, "Mail From: xxx", of SMTP conversation -# Scheck_mail -R$* $: $>3 $1 -R $* < @ $+ . > $: $2 -# R $* < @ $+ > $#error $: "451 Domain does not resolve" -R $* < @ $+ > $: $2 -R$+.$+.$+ $2.$3 -R$* $: $(spamsites $1 $: OK $) -ROK $@ OK +# called with envelope sender (everything after ":") in +# "Mail From: xxx", of SMTP conversation +# may or may not have "<" ">" +# the groups of rules in this ruleset ARE NOT independent. +# "remove all RFC-822 comments" must come first +# "Connecting Host" and "Paul Vixie's RBL" must be last +# +# use the ones that you want comment out the rest +# each group is preceded and followed by a comment +# +# remove all RFC-822 comments--BEGIN +# MUST be first rule in check_mail rulseset. +R$* $: $>3 $1 +# remove all RFC-822 comments--END +# mail must come from a DNS resolvable host--BEGIN +R$* < @ $+ . > $: $1 @ $2 +R$* < @ $+ > $#error $: "451 Domain does not resolve" +# mail must come from a DNS resolvable host--END +# mail must NOT come from a known source of spam--BEGIN +R$+ @$+ $: <$1@$2> $2 +R<$*> $+.$+.$+ <$1> $3.$4 +R<$*> $* $: $(spamsites $2 $: OK $) R$+.REJECT $#error $: 521 $1 +R<$*> $* $: $1 +# mail must NOT come from a known source of spam--END +# Connecting Host must resolve--BEGIN +R$* $: $1 $: $(dequote "" $&{client_name} $) +R$* $: $>3 foo@$1 +R<$*> $*<@$*> $#error $: "451 Domain does not resolve" +# Connecting Host must resolve--END +# ip address must NOT be in Paul Vixie's RBL--BEGIN +R$* $: $1 $: $(dequote "" $&{client_addr} $) +R$* $: $>check_rbl $1 +R$*.com. $#error $: "550 Mail refused, see http://maps.vix.com/rbl" +# ip address must NOT be in Paul Vixie's RBL--END +R$* $@ OK + +Scheck_rcpt +# called with envelope recipient (everything after ":") in +# "Rcpt To: xxx", of SMTP conversation +# may or may not have "<" ">" and or RFC-822 comments. +# let ruleset 3 clean this up for us. +# +# do NOT reorder these two groups of rules. +# restrict mail relaying to host and domains listed in /etc/sendmail.cR +# +# mail must NOT be addressed "fakenames"--BEGIN +R$* $: <$1> $>3 $1 +R<$*> $+ < @ $+ > $: <$1> $(fakenames $2 $: OK $) +R$+.REJECT $#error $: 521 $1 +R<$*> $* $: $1 +# mail must NOT be addressed "fakenames"--END +# mail must come from or go to this machine or machines we allow to relay--BEGIN +# R$* $: $>Parse0 $>3 $1 +# R$+ < @ $* . > $* $: $1 < @ $2 > +# R$+ < @ $=w> $@ OK +# R$+ < @ $* $=R> $@ OK +# R$* $: $(dequote "" $&{client_name} $) +# R$=w $@ OK +# R$* $=R $@ OK +# R$@ $@ OK +# R$* $#error $: "550 Relaying Denied" +# mail must come from or go to this machine or machines we allow to relay--END +R$* $@ OK -# for testing check_relay and check_mail -# if we type "$|", sendmail will split this into two tokens "$" and "|" -# this rule glues prevent sendmail from splitting "$|" -# to use: /usr/sbin/sendmail -bt -# host.domain.tld $| 111.222.333.444 -Sxlat -R$* $$| $* $: $1 $| $2 -R$* $| $* $@ $>check_relay $1 $| $2 diff -ur 2.2.5-RELEASE/etc/make.conf 2.2.6-RELEASE/etc/make.conf --- 2.2.5-RELEASE/etc/make.conf Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/make.conf Wed Mar 25 10:56:48 1998 @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.37.2.5 1997/10/16 18:11:58 jkh Exp $ +# $Id: make.conf,v 1.37.2.12 1998/03/18 11:07:27 obrien 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 @@ -18,6 +18,9 @@ #NOPROFILE= true # Avoid compiling profiled libraries # +# To avoid building the default system perl +#NOPERL= true +# # To have 'obj' symlinks created in your source directory # (they aren't needed/necessary) #OBJLINK= yes @@ -31,6 +34,11 @@ # #WANT_CSRG_LIBM= yes # +# To compile and install the reentrant-safe/thread-safe versions of the +# standard library. This library is useful to the mysql port and other +# software that wants to use pthreads. +#WANT_LIBC_R= yes +# # If you do not want unformatted manual pages to be compressed # when they are installed: # @@ -66,28 +74,19 @@ #BOOTWAIT=30000 # # By default, the system will always use the keyboard/video card as system -# console. However, the boot blocks may be configured to use a serial port -# or probe the hardware to determine if the serial port or kbd/video should -# be used. +# console. However, the boot blocks may be dynamically configured to use a +# serial port in addition to or instead of the keyboard/video console. # # By default we use COM1 as our serial console port *if* we're going to use # a serial port as our console at all. (0x3E8 = COM2) # #BOOT_COMCONSOLE_PORT= 0x3F8 # -# Uncomment the following line to test if a keyboard is present. If the -# keyboard isn't there, use the serial port as console. -# -#BOOT_PROBE_KEYBOARD= true -# -# Uncomment the following line to read the keyboard lock switch. If the -# keyboard is locked, use the serial port as console. -# -#BOOT_PROBE_KEYBOARD_LOCK= true +# The default serial console speed is 9600. Set the speed to a larger value +# for better interactive response. # -# Uncomment the following line to always force the use of a serial console. +#BOOT_COMCONSOLE_SPEED= 115200 # -#BOOT_FORCE_COMCONSOLE= true # # By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier. # If you have a XFree86 from before 3.0 that has the X distribution in @@ -140,23 +139,23 @@ # Some ports use a special variable to point to a collection of # mirrors of well-known software archives. If you have a mirror close # to you, uncomment any of the following lines and change it to that -# address. (Don't remove the "/${MASTER_SITE_SUBDIR}/" part.) +# address. (Don't remove the "/%SUBDIR%/" part.) # # Note: the right hand sides of the following lines are only for your # information. For a full list of default sites, take a look at # bsd.port.mk. # -#MASTER_SITE_XCONTRIB= ftp://ftp.x.org/contrib/${MASTER_SITE_SUBDIR}/ -#MASTER_SITE_GNU= ftp://prep.ai.mit.edu/pub/gnu/${MASTER_SITE_SUBDIR}/ -#MASTER_SITE_PERL_CPAN= ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/${MASTER_SITE_SUBDIR}/ -#MASTER_SITE_TEX_CTAN= ftp://ftp.tex.ac.uk/public/ctan/tex-archive/${MASTER_SITE_SUBDIR}/ -#MASTER_SITE_SUNSITE= ftp://sunsite.unc.edu/pub/Linux/${MASTER_SITE_SUBDIR}/ +#MASTER_SITE_XCONTRIB= ftp://ftp.x.org/contrib/%SUBDIR%/ +#MASTER_SITE_GNU= ftp://prep.ai.mit.edu/pub/gnu/%SUBDIR%/ +#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%/ # # # Kerberos IV -# If you want the eBones-based Kerberos, define this: +# If you want KerberosIV (KTH eBones), define this: # -#MAKE_EBONES= yes +#MAKE_KERBEROS4= yes # # # SUP/CVSup updates diff -ur 2.2.5-RELEASE/etc/monthly 2.2.6-RELEASE/etc/monthly --- 2.2.5-RELEASE/etc/monthly Tue Oct 21 23:21:09 1997 +++ 2.2.6-RELEASE/etc/monthly Wed Mar 25 10:56:48 1998 @@ -7,9 +7,24 @@ host=`hostname -s` echo "Subject: $host monthly run output" -echo "" -echo "Doing login accounting:" -ac -p | sort -nr +1 +W=/var/log/wtmp +if [ -f $W ] ; then + # Work out what month it was yesterday + M=`date -v-1m +%h` + + mv -f $W $W.$M + touch $W + + if [ -x /usr/sbin/ac ] ; then + echo "" + echo "Doing login accounting:" + + ac -p -w $W.$M | sort -nr +1 + fi + + rm -f $W.$M.gz + gzip $W.$M +fi if [ -f /etc/monthly.local ]; then echo "" diff -ur 2.2.5-RELEASE/etc/motd 2.2.6-RELEASE/etc/motd --- 2.2.5-RELEASE/etc/motd Tue Oct 21 23:21:09 1997 +++ 2.2.6-RELEASE/etc/motd Wed Mar 25 10:56:48 1998 @@ -2,7 +2,7 @@ Welcome to FreeBSD! -If the info distribution has been loaded on this machine, the FreeBSD +If the doc distribution has been loaded on this machine, the FreeBSD Handbook will be in file:/usr/share/doc/handbook and the FAQ in file:/usr/share/doc/FAQ diff -ur 2.2.5-RELEASE/etc/mtree/BSD.include.dist 2.2.6-RELEASE/etc/mtree/BSD.include.dist --- 2.2.5-RELEASE/etc/mtree/BSD.include.dist Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/mtree/BSD.include.dist Wed Mar 25 10:57:03 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.include.dist,v 1.7.2.2 1997/08/21 04:48:58 peter Exp $ +# $Id: BSD.include.dist,v 1.7.2.4 1998/02/27 21:01:42 jkh Exp $ # /set type=dir uname=bin gname=bin mode=0755 @@ -6,12 +6,16 @@ arpa .. g++ - std - .. + std + .. .. - kerberosIV + isofs + cd9660 + .. .. machine + .. + msdosfs .. net .. diff -ur 2.2.5-RELEASE/etc/mtree/BSD.local.dist 2.2.6-RELEASE/etc/mtree/BSD.local.dist --- 2.2.5-RELEASE/etc/mtree/BSD.local.dist Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/mtree/BSD.local.dist Wed Mar 25 10:57:03 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.local.dist,v 1.17.2.10 1997/10/06 08:09:51 jkh Exp $ +# $Id: BSD.local.dist,v 1.17.2.12 1998/03/20 16:54:33 itojun Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -86,7 +86,7 @@ mann .. .. - ja_JP.EUC + ja cat1 uname=man .. cat2 uname=man @@ -230,6 +230,8 @@ ru_SU.CP866 .. ru_SU.KOI8-R + .. + sl_SI.ISO_8859-2 .. sv_SE.ISO_8859-1 .. diff -ur 2.2.5-RELEASE/etc/mtree/BSD.root.dist 2.2.6-RELEASE/etc/mtree/BSD.root.dist --- 2.2.5-RELEASE/etc/mtree/BSD.root.dist Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/mtree/BSD.root.dist Wed Mar 25 10:57:03 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.root.dist,v 1.20.6.1 1997/10/20 00:54:13 jmb Exp $ +# $Id: BSD.root.dist,v 1.20.6.2 1998/02/27 21:03:13 jkh Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -16,14 +16,16 @@ .. kerberosIV .. - mail - .. + mail + .. mtree .. namedb .. ppp .. + skel + .. uucp uname=uucp gname=uucp mode=0770 .. .. diff -ur 2.2.5-RELEASE/etc/mtree/BSD.usr.dist 2.2.6-RELEASE/etc/mtree/BSD.usr.dist --- 2.2.5-RELEASE/etc/mtree/BSD.usr.dist Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/mtree/BSD.usr.dist Wed Mar 25 10:57:03 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.usr.dist,v 1.74.2.16 1997/10/18 10:52:26 joerg Exp $ +# $Id: BSD.usr.dist,v 1.74.2.22 1998/03/07 22:57:58 jkh Exp $ # /set type=dir uname=bin gname=bin mode=0755 @@ -7,7 +7,7 @@ .. /set type=dir uname=games gname=bin mode=0700 games uname=bin mode=0755 - hide + hide gname=games uname=root mode=0550 .. .. /set type=dir uname=bin gname=bin mode=0755 @@ -27,6 +27,8 @@ .. libexec lpr + ru + .. .. sm.bin .. @@ -53,6 +55,10 @@ dict .. doc + FAQ + .. + handbook + .. papers .. psd @@ -60,6 +66,8 @@ .. 12.make .. + 13.rcs + .. 18.gprof .. 19.curses @@ -80,6 +88,8 @@ .. 27.nfsrfc .. + 28.cvs + .. .. smm 01.setup @@ -200,8 +210,6 @@ games uname=bin atc .. - boggle - .. fortune .. larn @@ -297,12 +305,16 @@ .. no_NO.ISO_8859-1 .. + pl_PL.ISO_8859-2 + .. pt_PT.ISO_8859-1 .. ru_SU.CP866 .. ru_SU.KOI8-R .. + sl_SI.ISO_8859-2 + .. sv_SE.ISO_8859-1 .. .. @@ -334,6 +346,48 @@ .. catn .. + ja uname=bin + cat1 + .. + cat2 + .. + cat3 + .. + cat4 + .. + cat5 + .. + cat6 + .. + cat7 + .. + cat8 + .. + cat9 + .. + catn + .. + man1 uname=bin + .. + man2 uname=bin + .. + man3 uname=bin + .. + man4 uname=bin + .. + man5 uname=bin + .. + man6 uname=bin + .. + man7 uname=bin + .. + man8 uname=bin + .. + man9 uname=bin + .. + mann uname=bin + .. + .. man1 uname=bin .. man2 uname=bin @@ -415,6 +469,8 @@ .. ja_JP.EUC .. + ja_JP.SJIS + .. ko_KR.EUC .. lt_LN.ASCII @@ -429,11 +485,15 @@ .. no_NO.ISO_8859-1 .. + pl_PL.ISO_8859-2 + .. pt_PT.ISO_8859-1 .. ru_SU.CP866 .. ru_SU.KOI8-R + .. + sl_SI.ISO_8859-2 .. sv_SE.ISO_8859-1 .. diff -ur 2.2.5-RELEASE/etc/mtree/BSD.var.dist 2.2.6-RELEASE/etc/mtree/BSD.var.dist --- 2.2.5-RELEASE/etc/mtree/BSD.var.dist Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/mtree/BSD.var.dist Wed Mar 25 10:57:03 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.var.dist,v 1.26.2.3 1997/08/20 12:07:21 peter Exp $ +# $Id: BSD.var.dist,v 1.26.2.6 1998/03/07 22:58:01 jkh Exp $ # /set type=dir uname=bin gname=bin mode=0755 @@ -23,13 +23,15 @@ .. db uname=bin gname=bin mode=0755 .. -/set type=dir uname=games gname=bin mode=0755 - games - hackdir +/set type=dir uname=root gname=bin mode=0755 + games gname=games mode=0775 + hackdir gname=games mode=0770 + save gname=games mode=0770 + .. .. - larn + larn gname=games mode=0775 .. - phantasia + phantasia gname=games mode=0775 .. .. log uname=bin @@ -52,6 +54,8 @@ .. mqueue uname=root .. + opielocks uname=root mode=0700 + .. output uname=bin lpd uname=root gname=daemon .. diff -ur 2.2.5-RELEASE/etc/mtree/BSD.x11.dist 2.2.6-RELEASE/etc/mtree/BSD.x11.dist --- 2.2.5-RELEASE/etc/mtree/BSD.x11.dist Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/mtree/BSD.x11.dist Wed Mar 25 10:57:03 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.x11.dist,v 1.1.2.2 1997/06/10 07:56:30 asami Exp $ +# $Id: BSD.x11.dist,v 1.1.2.3 1998/03/20 16:54:34 itojun Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -208,7 +208,7 @@ .. catn uname=man .. - ja_JP.EUC + ja cat1 uname=man .. cat2 uname=man diff -ur 2.2.5-RELEASE/etc/namedb/PROTO.localhost.rev 2.2.6-RELEASE/etc/namedb/PROTO.localhost.rev --- 2.2.5-RELEASE/etc/namedb/PROTO.localhost.rev Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/namedb/PROTO.localhost.rev Wed Mar 25 10:57:03 1998 @@ -1,5 +1,5 @@ ; From: @(#)localhost.rev 5.1 (Berkeley) 6/30/90 -; $Id: PROTO.localhost.rev,v 1.1 1995/03/21 16:33:44 wollman Exp $ +; $Id: PROTO.localhost.rev,v 1.1.6.1 1998/02/27 21:32:55 jkh Exp $ ; ; This file is automatically edited by the `make-localhost' script in ; the /etc/namedb directory. @@ -8,7 +8,7 @@ @ IN SOA @host@. root.@host@. ( @date@ ; Serial 3600 ; Refresh - 300 ; Retry + 900 ; Retry 3600000 ; Expire 3600 ) ; Minimum IN NS @host@. diff -ur 2.2.5-RELEASE/etc/namedb/named.boot 2.2.6-RELEASE/etc/namedb/named.boot --- 2.2.5-RELEASE/etc/namedb/named.boot Tue Oct 21 23:21:30 1997 +++ 2.2.6-RELEASE/etc/namedb/named.boot Wed Mar 25 10:57:03 1998 @@ -1,4 +1,4 @@ -; $Id: named.boot,v 1.3.6.1 1997/05/08 15:25:32 joerg Exp $ +; $Id: named.boot,v 1.3.6.2 1997/12/23 21:05:55 jkh Exp $ ; From: @(#)named.boot 5.1 (Berkeley) 6/30/90 ; Refer to the named(8) man page for details. If you are ever going @@ -12,7 +12,7 @@ ; ; If you enable a local name server, don't forget to enter 127.0.0.1 ; into your /etc/resolv.conf so this server will be queried first. -; Also, make sure to enable it in /etc/sysconfig. +; Also, make sure to enable it in /etc/rc.conf. ; example sortlist config: ; sortlist 127.0.0.0 diff -ur 2.2.5-RELEASE/etc/newsyslog.conf 2.2.6-RELEASE/etc/newsyslog.conf --- 2.2.5-RELEASE/etc/newsyslog.conf Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/newsyslog.conf Wed Mar 25 10:56:48 1998 @@ -1,7 +1,7 @@ # configuration file for newsyslog -# $Id: newsyslog.conf,v 1.6.2.1 1997/02/05 14:18:24 mpp Exp $ +# $Id: newsyslog.conf,v 1.6.2.3 1998/02/27 20:49:09 jkh Exp $ # -# logfilename owner.group mode count size time [ZB] +# logfilename owner.group mode count size time [ZB] [/pid_file] /var/cron/log 600 3 100 * Z /var/log/amd.log 664 7 100 * Z /var/log/kerberos.log 664 7 100 * Z @@ -9,5 +9,4 @@ /var/log/maillog 664 7 * 24 Z /var/log/messages 664 5 100 * Z /var/log/slip.log 600 3 100 * Z -/var/log/ppp.log 600 3 100 * Z -/var/log/wtmp 664 7 * 168 ZB +/var/log/ppp.log 600 3 100 * Z diff -ur 2.2.5-RELEASE/etc/pccard.conf.sample 2.2.6-RELEASE/etc/pccard.conf.sample --- 2.2.5-RELEASE/etc/pccard.conf.sample Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/pccard.conf.sample Wed Mar 25 10:56:48 1998 @@ -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.4 1996/06/19 01:28:07 nate Exp $ +# $Id: pccard.conf.sample,v 1.4.2.5 1998/02/10 01:02:06 msmith Exp $ # Generally available IO ports io 0x240-0x360 @@ -45,6 +45,14 @@ remove echo Accton EN2212 removed remove /sbin/ifconfig ed0 delete +#Accton 2216 +card "ACCTON" "EN2216-PCMCIA-ETHERNET" + config 0x20 "ed0" 10 + insert echo Accton 2216 inserted + insert /etc/pccard_ether ed0 + remove echo Accton 2216 removed + remove /sbin/ifconfig ed0 delete + # 3Com Etherlink III 3C589B, 3C589C card "3Com Corporation" "3C589" config 0x1 "ep0" ? @@ -54,6 +62,30 @@ remove echo 3Com Etherlink III removed remove /sbin/ifconfig ep0 delete +# 3Com Etherlink III 3C589D +card "3Com Corporation" "3C589D" + config 0x1 "ep0" ? + insert echo 3Com Etherlink III inserted + insert /etc/pccard_ether ep0 + remove echo 3Com Etherlink III removed + remove /sbin/ifconfig ep0 delete + +# LinkSys ethernet card +card "E-CARD" "E-CARD" + config 0x20 "ed0" 10 + insert echo "LinkSys card inserted" + insert /etc/pccard_ether ed0 + remove echo "LinkSys card removed" + remove /sbin/ifconfig ed0 delete + +# Linksys Combo PCMCIA EthernetCard (model EC2T on box) +card "Linksys" "Combo PCMCIA EthernetCard (EC" + config 0x1 "ed0" ? + insert echo Linksys Ethernet inserted + insert /etc/pccard_ether ed0 + remove echo Linksys Ethernet removed + remove /sbin/ifconfig ed0 delete + # Farallon EtherMac card "Farallon" "ENet" config 0x1 "ep0" ? @@ -86,6 +118,12 @@ insert /etc/pccard_ether fe0 remove echo HT-4840-11 removed remove /sbin/ifconfig fe0 delete + +# Danpex (Alloy, etc.) EN-6200P2 +card "DANPEX" "EN-6200P2" + config 0x22 "ed0" 9 + insert /etc/pccard_ether ed0 + remove /sbin/ifconfig ed0 delete # AIWA PV-JF288 card "AIWA CO.,LTD." "PV-JF288 " @@ -93,6 +131,12 @@ insert echo AIWA PV-JF288 inserted remove echo AIWA PV-JF288 removed +# Apex Data 28.8 PC Card "MOBILE PLUS Cellular" modem. +card "AD PC_CARD" "RC288ACL" + config 0x22 "sio2" 10 + insert echo Apex Data Mobile Plus 28.8 Modem inserted + remove echo Apex Data Mobile Plus 28.8 Modem removed + # Megahertz XJ1144 card "MEGAHERTZ" "XJ1144" config 0x23 "sio2" 10 @@ -117,6 +161,18 @@ insert echo Megahertz XJ2288 inserted remove echo Megahertz XJ2288 removed +# Megahertz XJ4336 +card "Megahertz" "XJ4336-CC4336" + config 0x21 "sio1" 10 + insert echo Megahertz XJ4336 inserted + remove echo Megahertz XJ4336 removed + +# Megahertz XJ1336 +card "U.S. Robotics" "XJ/CC1336" + config 0x21 "sio2" 10 + insert echo U.S. Robotics XJ/CC1336 inserted + remove echo U.S. Robotics XJ/CC1336 removed + # Omron ME2814 FAX/DATA MODEM card "OMRON" "ME2814 FAX/DATA MOD" config 0x23 "sio2" 3 @@ -154,11 +210,11 @@ remove echo Newmedia 14.4 Modem removed # Omron MD24XCA FAX/Data Modem -card "OMRON Corp." "MD24XCA" - config 0x23 "sio2" 16 - reset 10000 - insert echo OMRON MD24XCA Modem inserted - remove echo OMRON MD24XCA Modem removed +#card "OMRON Corp." "MD24XCA" +# config 0x23 "sio2" 16 +# reset 10000 +# insert echo OMRON MD24XCA Modem inserted +# remove echo OMRON MD24XCA Modem removed # Hayes OPTIMA 288 FAX/Data Modem # currently does not work on my machine @@ -205,6 +261,13 @@ insert echo IBM Push/Pop Modem inserted remove echo IBM Push/Pop Modem removed +# Eiger PCCARD modem +# Apparently this modem does not work unless the recommended +# init string (AT&F&C1&D2) is supplied. +card "PCMCIA " "33.6K Fax/Modem " + config 23 "sio2" 5 + insert echo Eiger 33.6K modem inserted + remove echo Eiger 33.6K modem removed # BUG Linkboy D64K (ISDN) card "BUG Inc." "Linkboy D64K" @@ -219,37 +282,37 @@ remove echo NTT DoCoMo DATA/FAX Adapter removed # Panasonic FM-RADIO card -card "Panasonic" "CF-JVR101" - config 0x22 "sio3" 16 - insert echo Panasonic FM radio card inserted - remove echo Panasonic FM radio card removed +#card "Panasonic" "CF-JVR101" +# config 0x22 "sio3" 16 +# insert echo Panasonic FM radio card inserted +# remove echo Panasonic FM radio card removed # SunDisk Flash ATA # (OEM: Epson Flash Packer) -card "SunDisk" "SDP5" - config 0x3 "wdc1" 7 - insert echo Sundisk Flash ATA inserted - remove echo Sundisk Flash ATA removed - -card "SunDisk" "SDP" - config 0x3 "wdc1" 7 - insert echo SunDisk Flash ATA Inserted - remove echo SunDisk Flash ATA Removed +#card "SunDisk" "SDP5" +# config 0x3 "wdc1" 7 +# insert echo Sundisk Flash ATA inserted +# remove echo Sundisk Flash ATA removed + +#card "SunDisk" "SDP" +# config 0x3 "wdc1" 7 +# insert echo SunDisk Flash ATA Inserted +# remove echo SunDisk Flash ATA Removed # Midori Elec Fast Flash -card "Midori Elec." "FAST FLASH" - config 0x3 "wdc1" 9 - insert echo Midori Elec Fast FLASH inserted - remove echo Midori Elec Fast FLASH removed +#card "Midori Elec." "FAST FLASH" +# config 0x3 "wdc1" 9 +# insert echo Midori Elec Fast FLASH inserted +# remove echo Midori Elec Fast FLASH removed # Maxtor 131MB Type III HDD -card "Maxtor" "MXL131" - config 0x03 "wdc1" 10 - insert echo Maxtor 131MB HDD inserted - remove echo Maxtor 131MB HDD removed +#card "Maxtor" "MXL131" +# config 0x03 "wdc1" 10 +# insert echo Maxtor 131MB HDD inserted +# remove echo Maxtor 131MB HDD removed -# Adaptec SlimSCSI -card "Adaptec, Inc." "APA-1460 SCSI Host " +# Adaptec SlimSCSI (also included with Sony CD-ROM players) +card "Adaptec, Inc." "APA-1460 SCSI Host Adapter" config 0x9 "aic0" 10 insert echo Adaptec Slim SCSI inserted remove echo Adaptec Slim SCSI removed diff -ur 2.2.5-RELEASE/etc/pccard_ether 2.2.6-RELEASE/etc/pccard_ether --- 2.2.5-RELEASE/etc/pccard_ether Tue Oct 21 23:21:09 1997 +++ 2.2.6-RELEASE/etc/pccard_ether Wed Mar 25 10:56:48 1998 @@ -1,8 +1,8 @@ #!/bin/sh - # -# pccardether interfacename [ifconfig option] +# pccard_ether interfacename [ifconfig option] # -# example: pccardether ep0 -link0 +# example: pccard_ether ep0 -link0 # # Suck in the /etc/rc.conf variables @@ -12,10 +12,34 @@ if [ "x$pccard_ifconfig" != "xNO" ] ; then if [ "x$pccard_ifconfig" = "xDHCP" ] ; then - # DHCP currently not implemented + if [ -f /usr/local/sbin/dhclient ] ; then + if [ -s /var/run/dhclient.pid ] ; then + kill `cat /var/run/dhclient.pid` + rm /var/run/dhclient.pid + fi + /usr/local/sbin/dhclient + else + echo "DHCP client software not available (isc-dhcp2)" + fi else interface=$1 shift ifconfig $interface $pccard_ifconfig $* fi +fi + +if [ "x$defaultrouter" != "xNO" ] ; then + static_routes="default ${static_routes}" + route_default="default ${defaultrouter}" +fi + +# Set up any static routes. +if [ "x${static_routes}" != "x" ]; then + # flush beforehand, just in case.... + route -n flush + arp -d -a + for i in ${static_routes}; do + eval route_args=\$route_${i} + route add ${route_args} + done fi diff -ur 2.2.5-RELEASE/etc/phones 2.2.6-RELEASE/etc/phones --- 2.2.5-RELEASE/etc/phones Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/phones Wed Mar 25 10:56:48 1998 @@ -1,12 +1,11 @@ -# $Id: phones,v 1.4 1994/01/24 00:39:01 rgrimes Exp $ +# $Id: phones,v 1.4.10.1 1998/02/27 20:49:11 jkh Exp $ # From: @(#)phones 5.2 (Berkeley) 6/30/90 # # phones -- remote host phone number data base # see tip(1), phones(5) -# [tip cannot currently accept comments in this file, -# so this and the above lines must be removed.] -system1 9=3156427750 -system2 9148841241 -netcom 1(408)241-9760 -netcom 1(415)328-9940 -omen 1(503)621-3746 +# +system1 9=3155557750 +system2 9145551241 +netcom 1(408)555-9760 +netcom 1(415)555-9940 +omen 1(503)555-3746 Only in 2.2.5-RELEASE/etc/ppp: ppp.conf.filter.sample Only in 2.2.5-RELEASE/etc/ppp: ppp.conf.iij.sample diff -ur 2.2.5-RELEASE/etc/ppp/ppp.conf.sample 2.2.6-RELEASE/etc/ppp/ppp.conf.sample --- 2.2.5-RELEASE/etc/ppp/ppp.conf.sample Tue Oct 21 23:21:31 1997 +++ 2.2.6-RELEASE/etc/ppp/ppp.conf.sample Wed Mar 25 10:57:03 1998 @@ -2,129 +2,268 @@ # # PPP Sample Configuration File # -# Written by Toshiharu OHNO +# Originally written by Toshiharu OHNO # -# $Id: ppp.conf.sample,v 1.5.2.12 1997/09/10 01:00:27 brian Exp $ +# $Id: ppp.conf.sample,v 1.5.2.13 1998/01/30 19:54:36 brian Exp $ # ################################################################# +# This file is separated into sections. Each section is named with +# a label starting in column 0 and followed directly by a ``:''. The +# section continues until the next section. Blank lines and lines +# beginning with ``#'' are ignored. +# +# Lines beginning with "!include" will ``include'' another file. You +# may want to ``!include ~/.ppp.conf'' for backwards compatibility. +# + # Default setup. Always executed when PPP is invoked. +# This section is *not* loaded by the ``load'' or ``dial'' commands. +# +# This is the best place to specify your modem device, it's DTR rate, +# and any logging specification. Logging specs should be done first +# so that subsequent commands are logged. # default: + set log Phase Chat Connect Carrier LCP IPCP CCP tun command set device /dev/cuaa1 set speed 115200 - set log Phase Chat Connect Carrier hdlc LCP IPCP CCP tun deny lqr - set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" ATE1Q0 OK-AT-OK \\dATDT\\T TIMEOUT 40 CONNECT" + set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT" + +# Client side PPP +# +# Although the PPP protocol is a peer to peer protocol, we normally +# consider the side that makes the connection as the client and the +# side that receives the connection as the server. Authentication +# is required by the server either using a unix-style login proceedure +# or by demanding PAP or CHAP authentication from the client. +# + +# An on demand example where we have dynamic IP addresses: +# If the peer assigns us an arbitrary IP (most ISPs do this) and we +# can't predict what their IP will be either, take a wild guess at +# some IPs that you can't currently route to. Ensure that the "delete" +# and "add" lines are also present in the pmdemand section of ppp.linkup +# so that when we connect, things will be put straight. +# +# This will work with static IP numbers too. You can also use this entry +# if you don't want on-demand dialup. The "set ifaddr", "delete" and +# "add" lines are required for on-demand. Note, for dynamic IP numbers, +# whether dialing manually or on demand, there should *always* be an entry +# in ppp.linkup. +# +# The /0 bit in "set ifaddr" says that we insist on 0 bits of the +# specified IP actually being correct, therefore, the other side can assign +# any IP numbers. +# +# The forth arg to "set ifaddr" makes us send "0.0.0.0" as our requested +# IP number, forcing the peer to make the decision. +# +pmdemand: + set phone 1234567 + set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp" + set timeout 120 + set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0 + delete ALL + add 0 0 HISADDR + +# When we want to use PAP or CHAP instead of using a unix-style login +# proceedure, we do the following. Note, the peer suggests whether we +# should send PAP or CHAP. By default, we send whatever we're asked for. +# +PAPorCHAPpmdemand: + set phone 1234567 + set login + set authname MyName + set authkey MyKey + set timeout 120 + set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0 + delete ALL + add 0 0 HISADDR -# Example with a login script +# On demand dialup example with static IP addresses: +# Here, the local side uses 192.244.185.226 and the remote side +# uses 192.244.176.44. +# +# # ppp -auto ondemand +# +# It is not necessary to have an entry in ppp.linkup when both IP numbers +# are static. Be warned though, the MYADDR: label is executed from +# ppp.linkup if the "ondemand:" and "192.244.176.44" labels are not found. # -# o From PPP prompt, -# ppp> dial simplesite -# automatically dials and performs the login script. -# -# ppp> load simplesite -# loads and executes commands, but doesn't dial. -# -# o From shell, invoke as -# $ ppp simplesite -# to load commands associated with the 'simplesite' label. Use, -# ppp> dial -# to establish the connection. -# -simplesite: - set phone 12345678 - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp ocol: ppp" +ondemand: + set phone 1234567 + set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp" set timeout 120 + set ifaddr 192.244.185.226 192.244.176.44 255.255.255.0 + delete ALL + add 0 0 HISADDR +# Example segments +# +# The following lines may be included as part of your configuration +# section and aren't themselves complete. They're provided as examples +# of how to achieve different things. + +examples: # Multi-phone example. Numbers separated by a : are used sequentially. # Numbers separated by a | are used if the previous dial or login script # failed. Usually, you will prefer to use only one of | or :, but both # are allowed. # -multiphone: - set phone 12345678|12345679:12345670|12345671 - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp ocol: ppp" - -# If the peer requires that you use CHAP or PAP, you must supply authname -# and authkey. Both are "accepted" by default, so you don't have to do -# any more. + set phone 12345678|12345679:12345670|12345671 # -PAPorCHAPsite: - set phone 12345678 - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp" - set authname MySystemName - set authkey OurSecretKey - -# If you want the remote system to authenticate itself, you insist -# that the peer uses CHAP (or PAP) with the "enable" keyword. Both CHAP and -# PAP are disabled by default. -# When the peer authenticates itself, we use ppp.secret for verification. +# When in -auto, -ddial, -direct or -background mode, ppp can accept +# control instructions from the ``pppctl'' program. First, you must +# set up your control socket. It's safest to use a UNIX domain socket, +# and watch the permissions: +# + set server /var/tmp/internet 0177 +# +# Although a TCP port may be used if you want to allow control +# connections from other machines: +# + set server 6670 +# +# If you don't like ppp's builtin chat, use an external one: +# + set login "\"!chat \\\\-f /etc/ppp/ppp.dev.chat\"" +# +# If we have a ``strange'' modem that must be re-initialized when we +# hangup: +# + set hangup "\"\" AT OK-AT-OK ATZ OK" +# +# To adjust logging withouth blasting the setting in default: +# + set log -command +tcp/ip +# +# To see log messages on the screen in interactive mode: +# + set log local LCP IPCP CCP +# +# If you're seeing a lot of magic number problems and failed connections, +# try this (check out the FAQ): +# + set openmode passive +# +# For noisy lines, we may want to reconnect (up to 20 times) after loss +# of carrier: +# + set reconnect 3 20 +# +# When playing server for M$ clients, tell them who our name servers are: +# + set ns 10.0.0.1 10.0.0.2 + set nbns 10.0.0.1 10.0.0.2 + enable msext # -# Ppp is launched with +# If we're using the -alias switch, redirect ftp and http to an internal +# machine: # -# ppp -direct CHAPserver + alias port 10.0.0.2:ftp ftp + alias port 10.0.0.2:http http # -# Note: We can supply a third field in ppp.secret specifying the IP address -# for that user. +# or don't trust the outside at all +# + alias deny_incoming yes +# +# I trust user brian to run ppp, so this goes in the `default' section: +# + allow user brian +# +# But label `internet' contains passwords that even brian can't have, so +# I empty out the user access list in that section: +# + allow users +# +# I also may wish to set up my ppp login script so that it asks the client +# for the label they wish to use. I may only want user ``dodgy'' to access +# their own label in direct mode: +# +dodgy: + allow user dodgy + allow mode direct +# +# If we don't want ICMP and DNS packets to keep the connection alive: +# + set afilter 0 deny icmp + set afilter 1 deny udp src eq 53 + set afilter 2 deny udp dst eq 53 + set afilter 3 permit 0/0 0/0 +# +# And we don't want ICMPs to cause a dialup: +# + set dfilter 0 deny icmp + set dfilter 1 permit 0/0 0/0 +# +# Once the line's up, allow connections for ident (113), telnet (23), +# ftp (20 & 21), DNS (53), my place of work (192.244.191.0/24), +# ICMP (ping) and traceroute (>33433). +# +# Anything else is blocked by default +# + set ifilter 0 permit tcp dst eq 113 + set ofilter 0 permit tcp src eq 113 + set ifilter 1 permit tcp src eq 23 estab + set ofilter 1 permit tcp dst eq 23 + set ifilter 2 permit tcp src eq 21 estab + set ofilter 2 permit tcp dst eq 21 + set ifilter 3 permit tcp src eq 20 dst gt 1023 + set ofilter 3 permit tcp dst eq 20 + set ifilter 4 permit udp src eq 53 + set ofilter 4 permit udp dst eq 53 + set ifilter 5 permit 192.244.191.0/24 0/0 + set ofilter 5 permit 0/0 192.244.191.0/24 + set ifilter 6 permit icmp + set ofilter 6 permit icmp + set ifilter 7 permit udp dst gt 33433 + set ofilter 7 permit udp dst gt 33433 + + +# Server side PPP +# If you want the remote system to authenticate itself, you insist +# that the peer uses CHAP (or PAP) with the "enable" keyword. Both CHAP and +# PAP are disabled by default (we usually only "enable" on of them if the +# other side is dialing into our server). +# When the peer authenticates itself, we use ppp.secret for verification. +# +# Ppp is launched with: +# # ppp -direct CHAPserver +# +# Note: We can supply a third field in ppp.secret specifying the IP address +# for that user. # CHAPserver: enable chap enable proxy set ifaddr 192.244.176.44 292.244.184.31 -# If we wish to use /etc/passwd, we do this: +# If we wish to act as a server, allowing PAP access according to +# accounts in /etc/passwd, we do this: +# PAPServerwithPASSWD: enable pap enable passwdauth enable proxy set ifaddr 192.244.176.44 292.244.184.31 -# On demand dialup example -# Here, we assume that local side use 192.244.185.226 and -# remote side use 192.244.176.44 as their IP address. -# You must supply -auto, -ddial or -background option to invoke PPP. -# -# $ ppp -auto ondemand -# -ondemand: - set phone 1234567 - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp" - set timeout 120 - set ifaddr 192.244.185.226 192.244.176.44 255.255.255.0 - add 0 0 HISADDR - -# Another on demand example -# If the peer assigns us an arbitrary IP and we can't predict what their -# IP will be either, take a wild guess at an some IPs that you can't -# currently route to. Ensure that the "delete" and "add" lines are also -# present in ppp.linkup so that when we connect, things will be put straight. -# -# The /0 bit says that we insist on 0 bits of the specified IP actually -# being correct, therefore, the other side can assign any IP numbers. -# -pmdemand: - set phone 1234567 - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp" - set timeout 120 - set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 - delete ALL - add 0 0 HISADDR -# Examples to connect using a null-modem cable from one machine to another. -# The important thing here is to allow the lqr packets on both sides. -# Without them enabled, we can't tell if the line's dropped - there -# should always be carrier on a direct connection. -# Here, the server sends lqr's every 10 seconds and quits if three in a -# row fail. +# Example to connect using a null-modem cable: +# The important thing here is to allow the lqr packets on both sides. +# Without them enabled, we can't tell if the line's dropped - there +# should always be carrier on a direct connection. +# Here, the server sends lqr's every 10 seconds and quits if three in a +# row fail. # -# Make sure you don't have "deny lqr" in your default: on the client ! +# Make sure you don't have "deny lqr" in your default: on the client ! # direct-client: set dial "" set line /dev/cuaa0 set sp 115200 - set timeout 900 + set timeout 900 10 3 set log Phase Chat LQM set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp HELLO" set ifaddr 10.0.4.2 10.0.4.1 @@ -138,24 +277,11 @@ enable lqr accept lqr -# Example of Callback Request -# -# Here, we assume that peer will hangup the line and initiates a callback -# after successful authentication. We simply use chat script capability -# and wait for a "NO CARRIER" response from our modem. -# -# $ ppp callback -# -callback: - set phone 0312345678 - set login "ABORT NO\\sCARRIER TIMEOUT 5 ogin:--ogin: MyName word: MySecret TIMEOUT 20 DUMMY" - set log phase chat - dial - quit - -# Example for ppp over tcp. We assume that inetd on tcpsrv.mynet has been -# configured to run "ppp -direct tcp-server" when it gets a connection on -# port 1234. Read doc for further details + +# Example for PPP over TCP. +# We assume that inetd on tcpsrv.mynet has been +# configured to run "ppp -direct tcp-server" when it gets a connection on +# port 1234. Read the man page for further details # tcp-client: set device tcpsrv.mynet:1234 @@ -167,3 +293,28 @@ tcp-server: set escape 0xff set ifaddr 10.0.4.1 10.0.5.1 255.255.255.0 + +# If you want to test ppp, do it through a loopback: +# +# Requires a line in /etc/services: +# ppploop 6671/tcp # loopback ppp daemon +# +# and a line in /etc/inetd.conf: +# ppploop stream tcp nowait root /usr/sbin/ppp ppp -direct loop-in +# +loop: + set timeout 0 + set log phase chat connect lcp ipcp command + set device localhost:ppploop + set dial + set login + set escape 0xff + set ifaddr 127.0.0.2 127.0.0.3 + set openmode passive + set server /var/tmp/loop "" 0177 + +loop-in: + set timeout 0 + set log phase chat connect lcp ipcp command + set escape 0xff + allow mode direct Only in 2.2.5-RELEASE/etc/ppp: ppp.conf.server.sample Only in 2.2.5-RELEASE/etc/ppp: ppp.dialup.sample Only in 2.2.6-RELEASE/etc/ppp: ppp.linkdown.sample diff -ur 2.2.5-RELEASE/etc/ppp/ppp.linkup.sample 2.2.6-RELEASE/etc/ppp/ppp.linkup.sample --- 2.2.5-RELEASE/etc/ppp/ppp.linkup.sample Tue Oct 21 23:21:31 1997 +++ 2.2.6-RELEASE/etc/ppp/ppp.linkup.sample Wed Mar 25 10:57:03 1998 @@ -2,9 +2,8 @@ # # Example of ppp.linkup file # -# -# This file is checked when PPP establishes a connection. -# PPP searches the labels in this file as follows: +# This file is checked when ppp establishes a connection. +# ppp searches the labels in this file as follows: # # 1) The label that matches the IP number assigned to our side. # @@ -12,44 +11,45 @@ # # 3) If no label has been found, use MYADDR if it exists. # -# $Id: ppp.linkup.sample,v 1.3.2.4 1997/09/21 02:11:36 brian Exp $ +# +# $Id: ppp.linkup.sample,v 1.3.2.5 1998/01/30 19:54:38 brian Exp $ # ######################################################################### +# By default, simply delete any existing default route and add the peer +# as default gateway. +# If you're into sound effects when the link comes up, you can run +# ``auplay'' (assuming NAS is installed and configured). +# +MYADDR: + delete 0 + add 0 0 HISADDR + !bg /usr/X11R6/bin/auplay /etc/ppp/linkup.au + # If we've got 192.244.176.32 as our address, then regard peer as a gateway # to 192.244.176.0 network. # 192.244.176.32: add 192.244.176.0 0 HISADDR -# If we are invoked with an argument ``iij-demand'', then delete all -# existing route entries and add the peer as the default gateway. -# -iij-demand: - delete ALL - add 0 0 HISADDR - -# Otherwise, simply add peer as default gateway. -# -MYADDR: - delete 0 - add 0 0 HISADDR - # If we are invoked with an argument ``pmdemand'', then # delete all existing (wrong) routing entries and add the peer IP # as our default gateway. # This is vital if you don't already know either sides IP number. # -# We create a loopback route to ourselves so that we can "ping" -# our side of the connection -# # We also want to execute a script on startup. This script can do # nice things such as kick off "sendmail -q", "popclient my.isp" and # "slurp -d news". It can be passed MYADDR, HISADDR and INTERFACE -# too - useful for informing a DNS. +# as arguments too - useful for informing a DNS of your assigned IP. # pmdemand: delete ALL add 0 0 HISADDR - add MYADDR 255.255.255.255 127.0.0.1 !bg /etc/ppp/ppp.etherup.pmdemand + +# If your minimum call charge is 5 minutes, you may as well stay on +# the line for that amount of time. If we want a 60 second subsequent +# timeout, set your timeout to 300 in ppp.conf and then do this: +# +min5minutes: + !bg sh -c "sleep 240; pppctl -p mypassword 3000 set timeout 60" Only in 2.2.5-RELEASE/etc/ppp: ppp.pap.dialup.sample diff -ur 2.2.5-RELEASE/etc/ppp/ppp.secret.sample 2.2.6-RELEASE/etc/ppp/ppp.secret.sample --- 2.2.5-RELEASE/etc/ppp/ppp.secret.sample Tue Oct 21 23:21:31 1997 +++ 2.2.6-RELEASE/etc/ppp/ppp.secret.sample Wed Mar 25 10:57:03 1998 @@ -1,9 +1,23 @@ ################################################## -# Sysname Secret Key Peer's IP address # -# $Id: ppp.secret.sample,v 1.2 1995/02/26 12:16:37 amurai Exp $ +# Example of ppp.secret file +# +# This file is used to authenticate incoming connections. +# You must ``enable'' either PAP or CHAP in your ppp.conf file. +# The peer may then use any of the Authname/Authkey pairs listed. +# If an IP address is given, it will be assigned to the peer. +# +# If an entry exists for your local machine (as given by the +# ``hostname -s'' command), the password specified will be +# required for all server socket connections. Refer to the ppp(8) +# and pppctl(8) man pages for further details. +# +# $Id: ppp.secret.sample,v 1.2.6.1 1998/01/30 19:54:38 brian Exp $ # ################################################## -oscar OurSecretKey 192.244.184.34/24 -BigBird X4dWg9327 192.244.184.33/32 + +# Authname Authkey Peer's IP address + +oscar OurSecretKey 192.244.184.34/24 +BigBird X4dWg9327 192.244.184.33/32 tama localPasswdForControl diff -ur 2.2.5-RELEASE/etc/printcap 2.2.6-RELEASE/etc/printcap --- 2.2.5-RELEASE/etc/printcap Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/printcap Wed Mar 25 10:56:48 1998 @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $Id: printcap,v 1.5 1996/10/13 16:52:33 joerg Exp $ +# $Id: printcap,v 1.5.2.1 1998/02/07 19:17:32 ache Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -19,7 +19,11 @@ # Do also refer to section 7 (Printing) of the handbook. A local copy # can be found under /usr/share/doc/handbook/handbook.{html,latin1}. # +# Banner pages are now suppressed by default. Remove the :sh: +# capability to turn them back on. +# lp|local line printer:\ + :sh:\ :lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs: # # Sample remote printer. The physical printer is on machine "lphost". @@ -29,4 +33,12 @@ # argument after filtering. # #remote|sample remote printer:\ +# :sh:\ # :rm=lphost:sd=/var/spool/output/lphost:lf=/var/log/lpd-errs: +# +# Simple Russian printer with hardware CP866 character set, output filter +# used for KOI8-R -> CP866 conversion +# +#lp|Russian local line printer:\ +# :sh:of=/usr/libexec/lpr/ru/koi2alt:\ +# :lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs: diff -ur 2.2.5-RELEASE/etc/protocols 2.2.6-RELEASE/etc/protocols --- 2.2.5-RELEASE/etc/protocols Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/protocols Wed Mar 25 10:56:48 1998 @@ -1,12 +1,13 @@ # # Internet (IP) protocols # -# $Id: protocols,v 1.7 1997/10/03 01:32:41 itojun Exp $ +# $Id: protocols,v 1.4.2.3 1998/02/13 20:25:42 julian Exp $ # from: @(#)protocols 5.1 (Berkeley) 4/17/89 # -# Updated for FreeBSD based on RFC 1340, Assigned Numbers (July 1992). +# See also http://www.iana.org/in-notes/iana/assignments/protocol-numbers # ip 0 IP # internet protocol, pseudo protocol number +#hopopt 0 HOPOPT # hop-by-hop options for ipv6 icmp 1 ICMP # internet control message protocol igmp 2 IGMP # Internet Group Management ggp 3 GGP # gateway-gateway protocol @@ -22,9 +23,17 @@ iso-tp4 29 ISO-TP4 # ISO Transport Protocol class 4 xtp 36 XTP # Xpress Tranfer Protocol idpr-cmtp 39 IDPR-CMTP # IDPR Control Message Transport -ip6 41 IPV6 # internet protocol version 6 +ipv6 41 IPV6 # ipv6 +ipv6-route 43 IPV6-ROUTE # routing header for ipv6 +ipv6-frag 44 IPV6-FRAG # fragment header for ipv6 rsvp 46 RSVP # Resource ReSerVation Protocol -icmp6 58 ICMPV6 # ICMP for IPv6 +gre 47 GRE # Generic Routing Encapsulation (RFC 1702) +esp 50 ESP # encapsulating security payload +ah 51 AH # authentication header +skip 57 SKIP # SKIP +ipv6-icmp 58 IPV6-ICMP # ICMP for IPv6 +ipv6-nonxt 59 IPV6-NONXT # no next header for ipv6 +ipv6-opts 60 IPV6-OPTS # destination options for ipv6 vmtp 81 VMTP # Versatile Message Transport ospf 89 OSPFIGP # Open Shortest Path First IGP ipip 94 IPIP # Yet Another IP encapsulation diff -ur 2.2.5-RELEASE/etc/rc 2.2.6-RELEASE/etc/rc --- 2.2.5-RELEASE/etc/rc Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/rc Wed Mar 25 10:56:48 1998 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.104.2.24 1997/09/21 16:10:34 joerg Exp $ +# $Id: rc,v 1.104.2.33 1998/02/15 14:24:47 jkh Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -133,13 +133,25 @@ rm -rf /var/spool/uucp/.Temp/* (cd /var/run && { cp /dev/null utmp; chmod 644 utmp; }) -# enable dumpdev so that savecore can see it -# /var/crash should be a directory or a symbolic link -# to the crash directory if core dumps are to be saved. -if [ "X${dumpdev}" != X"NO" -a -e ${dumpdev} -a -d /var/crash ]; then - dumpon ${dumpdev} - echo -n checking for core dump... - savecore /var/crash +# +# Clearing /tmp at boot-time seems to have a long tradition. It doesn't +# help in any way for long-living systems, and it might accidentally +# clobber files you would rather like to have preserved after a crash +# (if not using mfs /tmp anyway). +# +# See also the example of another cleanup policy in /etc/periodic/daily. +# +if [ "X${clear_tmp_enable}" = X"YES" ]; then + echo clearing /tmp + + # prune quickly with one rm, then use find to clean up /tmp/[lq]* + # (not needed with mfs /tmp, but doesn't hurt there...) + (cd /tmp && rm -rf [a-km-pr-zA-Z]* && + find -d . ! -name . ! -name lost+found ! -name quotas -exec rm -rf -- {} \;) + + # Also remove X lock files since it will prevent you from + # restarting X11 after a system crash. + rm -f /tmp/.X*-lock /tmp/.X11-unix/* fi # snapshot any kernel -c changes back to disk @@ -167,6 +179,15 @@ fi echo '.' +# enable dumpdev so that savecore can see it +# /var/crash should be a directory or a symbolic link +# to the crash directory if core dumps are to be saved. +if [ "X${dumpdev}" != X"NO" -a -e ${dumpdev} -a -d /var/crash ]; then + dumpon ${dumpdev} + echo -n checking for core dump... + savecore /var/crash +fi + if [ -n "$network_pass1_done" ]; then network_pass2 fi @@ -206,9 +227,11 @@ # Make shared lib searching a little faster. Leave /usr/lib first if you # add your own entries or you may come to grief. _LDC=/usr/lib -if [ -d /usr/lib/compat ]; then _LDC="${_LDC} /usr/lib/compat" ; fi -if [ -d /usr/X11R6/lib ]; then _LDC="${_LDC} /usr/X11R6/lib" ; fi -if [ -d /usr/local/lib ]; then _LDC="${_LDC} /usr/local/lib" ; fi +for i in $ldconfig_paths; do + if test -d $i; then + _LDC="${_LDC} $i" + fi +done echo 'setting ldconfig path:' ${_LDC} ldconfig ${_LDC} diff -ur 2.2.5-RELEASE/etc/rc.conf 2.2.6-RELEASE/etc/rc.conf --- 2.2.5-RELEASE/etc/rc.conf Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/rc.conf Wed Mar 25 10:56:48 1998 @@ -6,7 +6,7 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.1.2.27 1997/10/18 10:07:26 jkh Exp $ +# $Id: rc.conf,v 1.1.2.40 1998/03/15 16:39:41 jkh Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -38,11 +38,15 @@ ### Network daemon (miscellaneous) & NFS options: ### syslogd_enable="YES" # Run syslog daemon (or NO). syslogd_flags="" # Flags to syslogd (if enabled). -inetd_enable="YES" # Run the network daemon displatcher (or NO). +inetd_enable="YES" # Run the network daemon dispatcher (or NO). inetd_flags="" # Optional flags to inetd. named_enable="NO" # Run named, the DNS server (or NO). +named_program="/usr/sbin/named" # named program, in case we want bind8 instead. named_flags="-b /etc/namedb/named.boot" # Flags to named (if enabled). kerberos_server_enable="NO" # Run a kerberos master server (or NO). +kadmind_server_enable="NO" # Run kadmind (or NO) -- do not run on + # a slave kerberos server +kerberos_stash="" # Is the kerberos master key stashed? rwhod_enable="NO" # Run the rwho daemon (or NO). amd_enable="NO" # Run amd service with $amd_flags (or NO). amd_flags="-a /net -c 1800 -k i386 -d my.domain -l syslog /host /etc/amd.map" @@ -56,6 +60,8 @@ rpc_statd_enable="YES" # Run NFS rpc.statd if nfs_server (or NO). portmap_enable="YES" # Run the portmapper service (or NO). portmap_flags="" # Flags to portmap (if enabled). +rarpd_enable="NO" # Run rarpd (or NO). +rarpd_flags="" # Flags to rarpd. xtend_enable="NO" # Run the X-10 power controller daemon. xtend_flags="" # Flags to xtend (if enabled). @@ -89,10 +95,13 @@ router="routed" # Name of routing daemon to use if enabled. router_flags="-q" # Flags for routing daemon. mrouted_enable="NO" # Do multicast routing (see /etc/mrouted.conf). +mrouted_flags="" # Flags for multicast routing daemon. ipxgateway_enable="NO" # Set to YES to enable IPX routing. ipxrouted_enable="NO" # Set to YES to run the IPX routing daemon. ipxrouted_flags="" # Flags for IPX routing daemon. -arpproxy_all="" # obsolete kernel option ARP_PROXY_ALL equiv. +arpproxy_all="" # replaces obsolete kernel option ARP_PROXYALL. +forward_sourceroute="NO" # do source routing (only if gateway_enable is set to "YES") +accept_sourceroute="NO" # accept source routed packets to us ############################################################## @@ -109,9 +118,10 @@ font8x14="NO" # font 8x14 from /usr/share/syscons/fonts/* (or NO). font8x8="NO" # font 8x8 from /usr/share/syscons/fonts/* (or NO). blanktime="NO" # blank time (in seconds) or "NO" to turn it off. -saver="NO" # screen saver desired: blank/green/snake/star/NO. -moused_type="NO" # See man page for rc.conf(5) for available settings. -moused_port="/dev/cuaa0" # Set to your mouse port (required if mousetype set). +saver="NO" # screen saver: blank/daemon/green/snake/star/NO. +moused_enable="NO" # Run the mouse daemon. +moused_type="auto" # See man page for rc.conf(5) for available settings. +moused_port="/dev/cuaa0" # Set to your mouse port. moused_flags="" # Any additional flags to moused. @@ -129,7 +139,9 @@ accounting_enable="NO" # Turn on process accounting (or NO). ibcs2_enable="NO" # Ibcs2 (SCO) emulation loaded at startup (or NO). linux_enable="NO" # Linux emulation loaded at startup (or NO). -rand_irqs="NO" # Stir the entropy pool (eg: "5 11" or NO). +rand_irqs="NO" # Stir the entropy pool (like "5 11" or NO). +clear_tmp_enable="NO" # Clear /tmp at startup. +ldconfig_paths="/usr/lib/compat /usr/X11R6/lib /usr/local/lib" # shared library search paths ############################################################## ### Allow local configuration override at the very end here ## diff -ur 2.2.5-RELEASE/etc/rc.firewall 2.2.6-RELEASE/etc/rc.firewall --- 2.2.5-RELEASE/etc/rc.firewall Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/rc.firewall Wed Mar 25 10:56:48 1998 @@ -1,6 +1,10 @@ ############ # Setup system for firewall service. -# $Id: rc.firewall,v 1.6.2.5 1997/10/21 00:20:35 jkh Exp $ +# $Id: rc.firewall,v 1.6.2.6 1998/02/10 01:45:57 adam Exp $ + +if [ -f /etc/rc.conf ]; then + . /etc/rc.conf +fi ############ # Define the firewall type in /etc/rc.conf. Valid values are: diff -ur 2.2.5-RELEASE/etc/rc.i386 2.2.6-RELEASE/etc/rc.i386 --- 2.2.5-RELEASE/etc/rc.i386 Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/rc.i386 Wed Mar 25 10:56:48 1998 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.18.2.9 1997/09/14 12:17:26 jkh Exp $ +# $Id: rc.i386,v 1.18.2.10 1998/03/07 09:06:19 jkh Exp $ # Do i386 specific processing # @@ -99,7 +99,7 @@ fi # mouse daemon -if [ "X${moused_type}" != X"NO" ] ; then +if [ "X${moused_enable}" = X"YES" ] ; then echo -n ' moused' moused ${moused_flags} -p ${moused_port} -t ${moused_type} vidcontrol <${viddev} -m on diff -ur 2.2.5-RELEASE/etc/rc.local 2.2.6-RELEASE/etc/rc.local --- 2.2.5-RELEASE/etc/rc.local Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/rc.local Wed Mar 25 10:56:48 1998 @@ -1,12 +1,12 @@ # # site-specific startup actions, daemons # -# $Id: rc.local,v 1.21.2.1 1997/08/13 06:50:33 dima Exp $ +# $Id: rc.local,v 1.21.2.2 1998/02/15 14:24:49 jkh Exp $ # # If there is a global system configuration file, suck it in. #if [ -f /etc/rc.conf ]; then -# . /etc/rc.conf +# . /etc/rc.conf #fi T=/tmp/_motd diff -ur 2.2.5-RELEASE/etc/rc.network 2.2.6-RELEASE/etc/rc.network --- 2.2.5-RELEASE/etc/rc.network Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/rc.network Wed Mar 25 10:56:48 1998 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.1.2.11 1997/09/18 22:47:12 danny Exp $ +# $Id: rc.network,v 1.1.2.18 1998/03/09 08:52:01 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -28,7 +28,7 @@ # Set up all the network interfaces, calling startup scripts if needed for ifn in ${network_interfaces}; do if [ -e /etc/start_if.${ifn} ]; then - . /etc/start_if.${ifn} ${ifn} + . /etc/start_if.${ifn} fi # Do the primary ifconfig if specified eval ifconfig_args=\$ifconfig_${ifn} @@ -58,10 +58,10 @@ # Initialize IP filtering using ipfw echo "" /sbin/ipfw -q flush > /dev/null 2>&1 - if [ $? = 1 ] ; then - firewall_in_kernel=0 - else + if [ $? = 0 ] ; then firewall_in_kernel=1 + else + firewall_in_kernel=0 fi if [ $firewall_in_kernel = 0 -a "x$firewall_enable" = "xYES" ] ; then @@ -81,8 +81,12 @@ . /etc/rc.firewall echo "Firewall rules loaded." else - echo "Warning: kernel has firewall functionality, but firewall rules are not enabled." - echo " All ip services are disabled." + IPFW_DEFAULT=`ipfw l 65535` + if [ "$IPFW_DEFAULT" = "65535 deny ip from any to any" ]; then + echo -n "Warning: kernel has firewall functionality, " + echo "but firewall rules are not enabled." + echo " All ip services are disabled." + fi fi fi @@ -113,6 +117,16 @@ sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1 fi + if [ "X$forward_sourceroute" = X"YES" ]; then + echo -n ' do source routing=YES' + sysctl -w net.inet.ip.sourceroute=1 >/dev/null 2>&1 + fi + + if [ "X$accept_sourceroute" = X"YES" ]; then + echo -n ' accept source routing=YES' + sysctl -w net.inet.ip.accept_sourceroute=1 >/dev/null 2>&1 + fi + if [ "X$router_enable" = X"YES" ]; then echo -n " ${router}"; ${router} ${router_flags} fi @@ -131,6 +145,10 @@ echo -n ' enabling ARP_PROXY_ALL: ' sysctl -w net.link.ether.inet.proxyall=1 2>&1 fi + if [ "X$rarpd_enable" = X"YES" ]; then + echo -n ' rarpd'; rarpd ${rarpd_flags} + fi + echo '.' network_pass1_done=YES # Let future generations know we made it. } @@ -138,17 +156,15 @@ network_pass2() { echo -n 'Doing additional network setup:' if [ "X${named_enable}" = X"YES" ]; then - echo -n ' named'; named ${named_flags} + echo -n ' named'; ${named_program-"named"} ${named_flags} fi - if [ "X${ntpdate_enable}" = X"YES" -o "X${xntpd_enable}" = X"YES" ]; then - if [ "X${ntpdate_enable}" = X"YES" ]; then - echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 - fi + if [ "X${ntpdate_enable}" = X"YES" ]; then + echo -n ' ntpdate'; ntpdate ${ntpdate_flags} >/dev/null 2>&1 + fi - if [ "X${xntpd_enable}" = X"YES" ]; then - echo -n ' xntpd'; xntpd ${xntpd_flags} - fi + if [ "X${xntpd_enable}" = X"YES" ]; then + echo -n ' xntpd'; xntpd ${xntpd_flags} fi if [ "X${timed_enable}" = X"YES" ]; then @@ -222,9 +238,18 @@ # Kerberos runs ONLY on the Kerberos server machine if [ "X${kerberos_server_enable}" = X"YES" ]; then - echo -n ' kerberos'; kerberos >> /var/log/kerberos.log & - echo -n ' kadmind'; \ - (sleep 20; kadmind -n >/dev/null 2>&1 &) & + if [ "X${kerberos_stash}" = "XYES" ]; then + stash_flag=-n + else + stash_flag= + fi + echo -n ' kerberos'; \ + kerberos ${stash_flags} >> /var/log/kerberos.log & + if [ "X${kadmind_server_enable}" = "XYES" ]; then + echo -n ' kadmind'; \ + (sleep 20; kadmind ${stash_flags} >/dev/null 2>&1 &) & + fi + unset stash_flag fi # IP multicast routing daemon diff -ur 2.2.5-RELEASE/etc/rc.serial 2.2.6-RELEASE/etc/rc.serial --- 2.2.5-RELEASE/etc/rc.serial Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/rc.serial Wed Mar 25 10:56:48 1998 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc.serial,v 1.6 1996/02/24 19:51:25 bde Exp $ +# $Id: rc.serial,v 1.6.2.3 1998/03/13 22:01:26 danny Exp $ # Change some defaults for serial devices. # Standard defaults are: @@ -118,10 +118,10 @@ # terminal d a 0 # Initialize all ports on a Cyclades-8yo. -# modem c c 0 1 2 3 4 5 6 7 +# modem c c 00 01 02 03 04 05 06 07 # Initialize all ports on a Cyclades-16ye. -# modem c c 0 1 2 3 4 5 6 7 8 9 a b c d e f +# modem c c 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f # Initialize all ports on a Digiboard 8. -# modem D D 0 1 2 3 4 5 6 7 +# modem D D 00 01 02 03 04 05 06 07 diff -ur 2.2.5-RELEASE/etc/remote 2.2.6-RELEASE/etc/remote --- 2.2.5-RELEASE/etc/remote Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/remote Wed Mar 25 10:56:48 1998 @@ -19,9 +19,9 @@ # Systems definitions netcom|Netcom Unix Access:\ - :pn=@:tc=unix1200: + :pn=\@:tc=unix1200: omen|Omen BBS:\ - :pn=@:tc=dos1200: + :pn=\@:tc=dos1200: # UNIX system definitions unix1200|1200 Baud dial-out to a UNIX system:\ diff -ur 2.2.5-RELEASE/etc/sendmail.cf 2.2.6-RELEASE/etc/sendmail.cf --- 2.2.5-RELEASE/etc/sendmail.cf Tue Oct 21 23:21:10 1997 +++ 2.2.6-RELEASE/etc/sendmail.cf Wed Mar 25 10:56:49 1998 @@ -37,7 +37,7 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by jkh@time.cdrom.com on Tue Oct 21 14:03:37 GMT 1997 +##### built by jkh@time.cdrom.com on Wed Mar 25 01:37:09 GMT 1998 ##### in /usr/src/usr.sbin/sendmail/cf/cf ##### using ../ as configuration include directory ##### @@ -142,7 +142,7 @@ CPREDIRECT # Configuration version number -DZ8.8.7 +DZ8.8.8 ############### diff -ur 2.2.5-RELEASE/etc/services 2.2.6-RELEASE/etc/services --- 2.2.5-RELEASE/etc/services Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/services Wed Mar 25 10:56:48 1998 @@ -9,7 +9,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $Id: services,v 1.27.2.9 1997/09/19 09:39:21 asami Exp $ +# $Id: services,v 1.27.2.16 1998/03/09 02:59:21 steve Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -169,8 +169,8 @@ # 87/tcp any private terminal link #PROBLEMS!=========================================================== # 87/udp any private terminal link -#kerberos 88/tcp krb5 # Kerberos (v5) -#kerberos 88/udp krb5 # Kerberos (v5) +kerberos-sec 88/tcp # krb5 # Kerberos (v5) +kerberos-sec 88/udp # krb5 # Kerberos (v5) su-mit-tg 89/tcp #SU/MIT Telnet Gateway su-mit-tg 89/udp #SU/MIT Telnet Gateway dnsix 90/tcp #DNSIX Securit Attribute Token Map @@ -485,7 +485,7 @@ arns 384/tcp #A Remote Network Server System arns 384/udp #A Remote Network Server System ibm-app 385/tcp #IBM Application -ibm-app 385/tcp #IBM Application +ibm-app 385/udp #IBM Application asa 386/tcp #ASA Message Router Object Def. asa 386/udp #ASA Message Router Object Def. aurp 387/tcp #Appletalk Update-Based Routing Pro. @@ -790,11 +790,11 @@ ris-cm 748/udp #Russell Info Sci Calendar Manager #kerberos-adm 749/tcp #Kerberos administration (v5) #kerberos-adm 749/udp #Kerberos administration (v5) -kerberos 750/udp kdc # Kerberos (v4) -kerberos 750/tcp kdc # Kerberos (v4) +kerberos-iv 750/udp kdc # Kerberos (v4) +kerberos-iv 750/tcp kdc # Kerberos (v4) #PROBLEMS!======================================================== -rfile 750/tcp -loadav 750/udp +#rfile 750/tcp +#loadav 750/udp #PROBLEMS!======================================================== kerberos_master 751/tcp # Kerberos `kadmin' (v4) kerberos_master 751/udp # Kerberos `kadmin' (v4) @@ -1055,7 +1055,7 @@ novell-lu6.2 1416/tcp #Novell LU6.2 novell-lu6.2 1416/udp #Novell LU6.2 timbuktu-srv1 1417/tcp #Timbuktu Service 1 Port -timbuktu-srv1 1417/tcp #Timbuktu Service 1 Port +timbuktu-srv1 1417/udp #Timbuktu Service 1 Port timbuktu-srv2 1418/tcp #Timbuktu Service 2 Port timbuktu-srv2 1418/udp #Timbuktu Service 2 Port timbuktu-srv3 1419/tcp #Timbuktu Service 3 Port @@ -1129,7 +1129,7 @@ genie-lm 1453/tcp #Genie License Manager genie-lm 1453/udp #Genie License Manager interhdl_elmd 1454/tcp #interHDL License Manager -interhdl_elmd 1454/tcp #interHDL License Manager +interhdl_elmd 1454/udp #interHDL License Manager esl-lm 1455/tcp #ESL License Manager esl-lm 1455/udp #ESL License Manager dca 1456/tcp @@ -1333,7 +1333,6 @@ pciarray 1552/udp issd 1600/tcp issd 1600/udp -radius 1645/udp #radiusd radacct 1646/udp nkd 1650/tcp nkd 1650/udp @@ -1365,6 +1364,8 @@ netview-aix-11 1671/udp netview-aix-12 1672/tcp netview-aix-12 1672/udp +pptp 1723/tcp #Point-to-point tunnelling protocol +radius 1812/udp #RADIUS authentication protocol (RFC 2138) licensedaemon 1986/tcp #cisco license management licensedaemon 1986/udp #cisco license management tr-rsrb-p1 1987/tcp #cisco RSRB Priority 1 port @@ -1490,8 +1491,8 @@ dls-monitor 2048/udp nfsd 2049/udp nfs # NFS server daemon #PROBLEMS!============================================================= -shilp 2049/tcp -shilp 2049/udp +#shilp 2049/tcp +#shilp 2049/udp #PROBLEMS!============================================================= dlsrpn 2065/tcp #Data Link Switch Read Port Number dlsrpn 2065/udp #Data Link Switch Read Port Number @@ -1499,9 +1500,15 @@ dlswpn 2067/udp #Data Link Switch Write Port Number zephyr-clt 2103/udp #Zephyr serv-hm connection zephyr-hm 2104/udp #Zephyr hostmanager -zephyr-hm-srv 2105/udp #Zephyr hm-serv connection +#PROBLEMS!============================================================= +#zephyr-hm-srv 2105/udp #Zephyr hm-serv connection +#PROBLEMS!============================================================= eklogin 2105/tcp #Kerberos (v4) encrypted rlogin +eklogin 2105/udp #Kerberos (v4) encrypted rlogin +ekshell 2106/tcp #Kerberos (v4) encrypted rshell +ekshell 2106/udp #Kerberos (v4) encrypted rshell rkinit 2108/tcp #Kerberos (v4) remote initialization +rkinit 2108/udp #Kerberos (v4) remote initialization ats 2201/tcp #Advanced Training System Program ats 2201/udp #Advanced Training System Program ivs-video 2232/tcp #IVS Video default Only in 2.2.6-RELEASE/etc: skel diff -ur 2.2.5-RELEASE/etc/ttys 2.2.6-RELEASE/etc/ttys --- 2.2.5-RELEASE/etc/ttys Tue Oct 21 23:21:08 1997 +++ 2.2.6-RELEASE/etc/ttys Wed Mar 25 10:56:48 1998 @@ -9,14 +9,15 @@ # ttyv0 "/usr/libexec/getty Pc" cons25 on secure # Virtual terminals -ttyv1 "/usr/libexec/getty Pc" cons25 on secure -ttyv2 "/usr/libexec/getty Pc" cons25 on secure -ttyv3 "/usr/libexec/getty Pc" cons25 off secure +ttyv1 "/usr/libexec/getty Pc" cons25 on secure +ttyv2 "/usr/libexec/getty Pc" cons25 on secure +ttyv3 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals -ttyd0 "/usr/libexec/getty std.9600" unknown off secure -ttyd1 "/usr/libexec/getty std.9600" unknown off secure -ttyd2 "/usr/libexec/getty std.9600" unknown off secure -ttyd3 "/usr/libexec/getty std.9600" unknown off secure +# The 'dialup' keyword identifies dialin lines to login, fingerd etc. +ttyd0 "/usr/libexec/getty std.9600" dialup off secure +ttyd1 "/usr/libexec/getty std.9600" dialup off secure +ttyd2 "/usr/libexec/getty std.9600" dialup off secure +ttyd3 "/usr/libexec/getty std.9600" dialup off secure # Pseudo terminals ttyp0 none network ttyp1 none network diff -ur 2.2.5-RELEASE/etc/weekly 2.2.6-RELEASE/etc/weekly --- 2.2.5-RELEASE/etc/weekly Tue Oct 21 23:21:09 1997 +++ 2.2.6-RELEASE/etc/weekly Wed Mar 25 10:56:48 1998 @@ -1,7 +1,7 @@ #!/bin/sh - # # @(#)weekly 5.14 (Berkeley) 6/23/91 -# $Id: weekly,v 1.17.2.1 1997/02/25 17:52:00 adam Exp $ +# $Id: weekly,v 1.17.2.2 1998/01/10 00:06:55 steve Exp $ PATH=/bin:/sbin:/usr/sbin:/usr/bin:/usr/libexec export PATH @@ -50,16 +50,20 @@ fgrep -v 'Permission denied' chmod 444 ${locdb} -echo "" -echo "Rebuilding whatis database:" -if [ -d /usr/X11R6/man ] -then -MANPATH=${MANPATH:-/usr/share/man:/usr/X11R6/man:/usr/local/man} -else -MANPATH=${MANPATH:-/usr/share/man:/usr/local/man} -fi +if [ -x /usr/libexec/makewhatis.local -a -x /usr/bin/manpath ] ; then -makewhatis.local "${MANPATH}" + echo "" + echo "Rebuilding whatis database:" + + MANPATH=`/usr/bin/manpath -q` + if [ $? = 0 ]; then + if [ "x${MANPATH}" = "x" ]; then + echo "manpath failed to find any manpage directories" + else + /usr/libexec/makewhatis.local "${MANPATH}" + fi + fi +fi #echo "" #echo "Reformatting manual pages:"