diff -urN 2.2.7-RELEASE/etc/csh.cshrc 2.2.8-RELEASE/etc/csh.cshrc --- 2.2.7-RELEASE/etc/csh.cshrc Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/csh.cshrc Mon Nov 30 14:15:13 1998 @@ -1 +1,3 @@ +# $Id: csh.cshrc,v 1.1.1.1.10.1 1998/09/03 22:14:37 brian Exp $ +# # System-wide .cshrc file for csh(1). diff -urN 2.2.7-RELEASE/etc/csh.login 2.2.8-RELEASE/etc/csh.login --- 2.2.7-RELEASE/etc/csh.login Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/csh.login Mon Nov 30 14:15:13 1998 @@ -1,3 +1,5 @@ +# $Id: csh.login,v 1.16.2.2 1998/09/03 22:14:37 brian Exp $ +# # System-wide .login file for csh(1). # Uncomment this to give you the default 4.2 behavior, where disk # information is shown in K-Blocks diff -urN 2.2.7-RELEASE/etc/csh.logout 2.2.8-RELEASE/etc/csh.logout --- 2.2.7-RELEASE/etc/csh.logout Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/csh.logout Mon Nov 30 14:15:13 1998 @@ -1 +1,3 @@ +# $Id: csh.logout,v 1.1.1.1.10.1 1998/09/03 22:14:37 brian Exp $ +# # System-wide .logout file for csh(1). diff -urN 2.2.7-RELEASE/etc/daily 2.2.8-RELEASE/etc/daily --- 2.2.7-RELEASE/etc/daily Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/daily Mon Nov 30 14:15:14 1998 @@ -1,5 +1,6 @@ #!/bin/sh - # +# $Id: daily,v 1.21.2.4 1998/09/13 23:10:08 brian Exp $ # @(#)daily 5.12 (Berkeley) 5/24/91 # PATH=/bin:/usr/bin:/sbin:/usr/sbin diff -urN 2.2.7-RELEASE/etc/disktab 2.2.8-RELEASE/etc/disktab --- 2.2.7-RELEASE/etc/disktab Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/disktab Mon Nov 30 14:15:14 1998 @@ -1,3 +1,5 @@ +# $Id: disktab,v 1.9.2.6 1998/09/03 22:14:38 brian Exp $ +# # Disk geometry and partition layout tables. # Key: # dt controller type diff -urN 2.2.7-RELEASE/etc/dm.conf 2.2.8-RELEASE/etc/dm.conf --- 2.2.7-RELEASE/etc/dm.conf Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/dm.conf Mon Nov 30 14:15:13 1998 @@ -1,5 +1,6 @@ # # Game Control File +# $Id: dm.conf,v 1.1.1.1.10.1 1998/09/03 22:14:37 brian Exp $ # @(#)dm.conf 5.5 (Berkeley) 4/12/89 # diff -urN 2.2.7-RELEASE/etc/ftpusers 2.2.8-RELEASE/etc/ftpusers --- 2.2.7-RELEASE/etc/ftpusers Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/ftpusers Mon Nov 30 14:15:13 1998 @@ -1,3 +1,5 @@ +# $Id: ftpusers,v 1.3.2.1 1998/09/03 22:14:37 brian Exp $ +# # list of users disallowed any ftp access. # read by ftpd(8). root diff -urN 2.2.7-RELEASE/etc/gettytab 2.2.8-RELEASE/etc/gettytab --- 2.2.7-RELEASE/etc/gettytab Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/gettytab Mon Nov 30 14:15:13 1998 @@ -1,3 +1,4 @@ +# $Id: gettytab,v 1.12.2.4 1998/09/03 22:14:37 brian Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, diff -urN 2.2.7-RELEASE/etc/group 2.2.8-RELEASE/etc/group --- 2.2.7-RELEASE/etc/group Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/group Mon Nov 30 14:15:13 1998 @@ -1,3 +1,5 @@ +# $Id: group,v 1.13.2.4 1998/09/13 23:10:08 brian Exp $ +# wheel:*:0:root daemon:*:1:daemon kmem:*:2:root diff -urN 2.2.7-RELEASE/etc/host.conf 2.2.8-RELEASE/etc/host.conf --- 2.2.7-RELEASE/etc/host.conf Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/host.conf Mon Nov 30 14:15:13 1998 @@ -1,7 +1,7 @@ -# $Id: host.conf,v 1.2 1993/11/07 01:02:57 wollman 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.2.10.1 1998/11/23 10:24:02 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 -urN 2.2.7-RELEASE/etc/hosts.equiv 2.2.8-RELEASE/etc/hosts.equiv --- 2.2.7-RELEASE/etc/hosts.equiv Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/hosts.equiv Mon Nov 30 14:15:13 1998 @@ -1,2 +1,4 @@ +# $Id: hosts.equiv,v 1.2.6.1 1998/09/03 22:14:37 brian Exp $ +# #localhost #my_very_good_friend.domain diff -urN 2.2.7-RELEASE/etc/hosts.lpd 2.2.8-RELEASE/etc/hosts.lpd --- 2.2.7-RELEASE/etc/hosts.lpd Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/hosts.lpd Mon Nov 30 14:15:13 1998 @@ -1,2 +1,4 @@ +# $Id: hosts.lpd,v 1.1.1.1.10.2 1998/09/03 22:14:37 brian Exp $ +# # See lpd(8) #machine.domain diff -urN 2.2.7-RELEASE/etc/inetd.conf 2.2.8-RELEASE/etc/inetd.conf --- 2.2.7-RELEASE/etc/inetd.conf Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/inetd.conf Mon Nov 30 14:15:13 1998 @@ -1,3 +1,4 @@ +# $Id: inetd.conf,v 1.23.2.6 1998/09/03 22:14:37 brian Exp $ # # Internet server configuration database # diff -urN 2.2.7-RELEASE/etc/login.access 2.2.8-RELEASE/etc/login.access --- 2.2.7-RELEASE/etc/login.access Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/login.access Mon Nov 30 14:15:14 1998 @@ -1,3 +1,5 @@ +# $Id: login.access,v 1.1.8.1 1998/09/03 22:14:37 brian Exp $ +# # Login access control table. # # When someone logs in, the table is scanned for the first entry that diff -urN 2.2.7-RELEASE/etc/mail/Makefile 2.2.8-RELEASE/etc/mail/Makefile --- 2.2.7-RELEASE/etc/mail/Makefile Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/mail/Makefile Mon Nov 30 14:15:29 1998 @@ -1,3 +1,5 @@ +# $Id: Makefile,v 1.1.2.6 1998/09/13 23:10:08 brian Exp $ + default: .if exists(/etc/mail/ips.txt) mv -f /etc/mail/ips.txt /etc/mail/ips.txt.0 diff -urN 2.2.7-RELEASE/etc/mail/README 2.2.8-RELEASE/etc/mail/README --- 2.2.7-RELEASE/etc/mail/README Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/mail/README Mon Nov 30 14:15:29 1998 @@ -1,3 +1,5 @@ +# $Id: README,v 1.1.2.2 1998/09/03 22:14:38 brian Exp $ + Filtering out SPAM from your site Introduction: diff -urN 2.2.7-RELEASE/etc/mail/sendmail.cf.additions 2.2.8-RELEASE/etc/mail/sendmail.cf.additions --- 2.2.7-RELEASE/etc/mail/sendmail.cf.additions Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/mail/sendmail.cf.additions Mon Nov 30 14:15:29 1998 @@ -1,3 +1,5 @@ +# $Id: sendmail.cf.additions,v 1.1.2.7 1998/09/03 22:14:38 brian Exp $ +# # 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 diff -urN 2.2.7-RELEASE/etc/mail.rc 2.2.8-RELEASE/etc/mail.rc --- 2.2.7-RELEASE/etc/mail.rc Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/mail.rc Mon Nov 30 14:15:14 1998 @@ -1,2 +1,2 @@ -set append dot save ask +set append dot save ask crt ignore Received Message-Id Resent-Message-Id Status Mail-From Return-Path Via diff -urN 2.2.7-RELEASE/etc/make.conf 2.2.8-RELEASE/etc/make.conf --- 2.2.7-RELEASE/etc/make.conf Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/make.conf Mon Nov 30 14:15:14 1998 @@ -1,4 +1,4 @@ -# $Id: make.conf,v 1.37.2.15 1998/06/26 01:44:08 jkh Exp $ +# $Id: make.conf,v 1.37.2.17 1998/08/25 10:53:43 jkoshy 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 @@ -64,7 +64,7 @@ # Default format for system documentation, depends on your printer. # Set this to "ascii" for simple printers or screen # -#PRINTER= ps +#PRINTERDEVICE= ps # # # How long to wait for a console keypress before booting the default kernel. @@ -200,6 +200,13 @@ # If you want KerberosIV (KTH eBones), define this: # #MAKE_KERBEROS4= yes +# +# +# Kerberos5 +# If you want to install Kerberos5 somewhere other than /usr/local, +# define this: +# +#KRB5_HOME= /usr/local/krb5 # # # CVSup update flags. Edit SUPFILE settings to reflect whichever distribution diff -urN 2.2.7-RELEASE/etc/manpath.config 2.2.8-RELEASE/etc/manpath.config --- 2.2.7-RELEASE/etc/manpath.config Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/manpath.config Mon Nov 30 14:15:14 1998 @@ -1,4 +1,4 @@ -# manpath.config +# $Id: manpath.config,v 1.4.2.2 1998/09/13 23:11:13 brian 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 diff -urN 2.2.7-RELEASE/etc/manpath.config.sample 2.2.8-RELEASE/etc/manpath.config.sample --- 2.2.7-RELEASE/etc/manpath.config.sample Wed Jul 22 17:12:24 1998 +++ 2.2.8-RELEASE/etc/manpath.config.sample Mon Nov 30 14:10:19 1998 @@ -1,4 +1,4 @@ -# manpath.config +# $Id: manpath.config,v 1.4.2.2 1998/09/13 23:11:13 brian 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 diff -urN 2.2.7-RELEASE/etc/modems 2.2.8-RELEASE/etc/modems --- 2.2.7-RELEASE/etc/modems Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/modems Mon Nov 30 14:15:14 1998 @@ -1,4 +1,5 @@ # +# $Id: modems,v 1.2.6.1 1998/09/03 22:14:37 brian Exp $ # @(#)modems 3/24/95 # # modems -- modem configuration data base file diff -urN 2.2.7-RELEASE/etc/monthly 2.2.8-RELEASE/etc/monthly --- 2.2.7-RELEASE/etc/monthly Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/monthly Mon Nov 30 14:15:14 1998 @@ -1,5 +1,6 @@ #!/bin/sh - # +# $Id: monthly,v 1.6.2.2 1998/09/13 23:10:08 brian Exp $ # @(#)monthly 5.5 (Berkeley) 6/17/91 # diff -urN 2.2.7-RELEASE/etc/mtree/BSD.local.dist 2.2.8-RELEASE/etc/mtree/BSD.local.dist --- 2.2.7-RELEASE/etc/mtree/BSD.local.dist Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/mtree/BSD.local.dist Mon Nov 30 14:15:28 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.local.dist,v 1.17.2.12 1998/03/20 16:54:33 itojun Exp $ +# $Id: BSD.local.dist,v 1.17.2.13 1998/11/20 00:05:19 julian Exp $ # /set type=dir uname=root gname=wheel mode=0755 @@ -198,6 +198,8 @@ fr_FR.ISO_8859-1 .. hr_HR.ISO_8859-2 + .. + hu_HU.ISO_8859-2 .. is_IS.ISO_8859-1 .. diff -urN 2.2.7-RELEASE/etc/mtree/BSD.usr.dist 2.2.8-RELEASE/etc/mtree/BSD.usr.dist --- 2.2.7-RELEASE/etc/mtree/BSD.usr.dist Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/mtree/BSD.usr.dist Mon Nov 30 14:15:28 1998 @@ -1,4 +1,4 @@ -# $Id: BSD.usr.dist,v 1.74.2.23 1998/07/20 03:09:21 jkh Exp $ +# $Id: BSD.usr.dist,v 1.74.2.26 1998/11/20 00:05:19 julian Exp $ # /set type=dir uname=bin gname=bin mode=0755 @@ -61,6 +61,16 @@ .. handbook .. + es + FAQ + .. + .. + ja + FAQ + .. + handbook + .. + .. papers .. psd @@ -121,6 +131,28 @@ 18.net .. .. + tutorials + ddwg + .. + mh + .. + devel + .. + diskformat + .. + disklessx + .. + fonts + .. + ppp + .. + multios + .. + newuser + .. + upgrade + .. + .. usd 04.csh .. @@ -283,6 +315,8 @@ .. hr_HR.ISO_8859-2 .. + hu_HU.ISO_8859-2 + .. is_IS.ISO_8859-1 .. it_CH.ISO_8859-1 @@ -462,6 +496,8 @@ fr_FR.ISO_8859-1 .. hr_HR.ISO_8859-2 + .. + hu_HU.ISO_8859-2 .. is_IS.ISO_8859-1 .. diff -urN 2.2.7-RELEASE/etc/namedb/make-localhost 2.2.8-RELEASE/etc/namedb/make-localhost --- 2.2.7-RELEASE/etc/namedb/make-localhost Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/namedb/make-localhost Mon Nov 30 14:15:28 1998 @@ -1,5 +1,7 @@ #!/bin/sh # +# $Id: make-localhost,v 1.1.6.2 1998/09/13 23:10:08 brian Exp $ +# # make-localhost - edit the appropriate local information into # /etc/namedb/localhost.rev # diff -urN 2.2.7-RELEASE/etc/networks 2.2.8-RELEASE/etc/networks --- 2.2.7-RELEASE/etc/networks Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/networks Mon Nov 30 14:15:14 1998 @@ -1,3 +1,4 @@ +# $Id: networks,v 1.1.1.1.10.1 1998/09/03 22:14:37 brian Exp $ # @(#)networks 5.1 (Berkeley) 6/30/90 # # Your Local Networks Database diff -urN 2.2.7-RELEASE/etc/pccard.conf.sample 2.2.8-RELEASE/etc/pccard.conf.sample --- 2.2.7-RELEASE/etc/pccard.conf.sample Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/pccard.conf.sample Mon Nov 30 14:15:14 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.2.6 1998/07/19 06:53:20 jkh Exp $ +# $Id: pccard.conf.sample,v 1.4.2.10 1998/10/22 08:36:31 jkh Exp $ # Generally available IO ports io 0x240-0x360 @@ -125,6 +125,19 @@ insert /etc/pccard_ether ed0 remove /sbin/ifconfig ed0 delete +# Fujitsu MBH10303 Ethernet PCMCIA +card "EAGLE Technology" "NE200 ETHERNET LAN MBH10303 " + config 0x1 "fe0" ? + insert /etc/pccard_ether fe0 + remove /sbin/ifconfig fe0 delete + +# Compex Net-A adapter +card "Ethernet" "Adapter" + config 0x1 "ed0" 11 + ether 0xff0 + insert /etc/pccard_ether ed0 + remove /sbin/ifconfig ed0 delete + # Telecom Device SuperSocket RE450T # Note: There are several revisions of the cardon the market. # Type A needs no "ether" line. @@ -239,6 +252,12 @@ insert echo Optima 288 inserted remove echo Optima 288 removed +# This one does work though +card "HAYES" "OPT288" + config 0x23 "sio3" 9 + insert echo Hayes Optima 28.8k inserted + remove echo Hayes Optima 28.8k removed + # PREMAX FM288 FAX/Data Modem card "PREMAX" "FM288 " config 0x23 "sio2" 10 @@ -303,6 +322,12 @@ insert echo U.S. Robotics XJ1560J inserted remove echo U.S. Robotics XJ1560J removed +# 3com/USR/Megahertz 3CCM556 +card "3Com" "3CXM/3CCM556" + config 0x23 "sio2" 10 + insert echo 3Com PCMCIA 56K Modem inserted + remove echo 3Com PCMCIA 56K Modem removed + # BUG Linkboy D64K (ISDN) card "BUG Inc." "Linkboy D64K" config 0x23 "sio2" 3 @@ -362,3 +387,7 @@ # config 0x3a "spc0" 11 # insert echo REX-5535 SCSI card inserted # remove echo REX-5535 SCSI card removed + +# Libretto floppy drive. +card "Y-E DATA" "External FDD" + config 0x4 "fdc0" 10 diff -urN 2.2.7-RELEASE/etc/pccard_ether 2.2.8-RELEASE/etc/pccard_ether --- 2.2.7-RELEASE/etc/pccard_ether Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/pccard_ether Mon Nov 30 14:15:14 1998 @@ -1,5 +1,7 @@ #!/bin/sh - # +# $Id: pccard_ether,v 1.2.4.5 1998/09/03 22:14:37 brian Exp $ +# # pccard_ether interfacename [ifconfig option] # # example: pccard_ether ep0 -link0 diff -urN 2.2.7-RELEASE/etc/ppp/ppp.conf.sample 2.2.8-RELEASE/etc/ppp/ppp.conf.sample --- 2.2.7-RELEASE/etc/ppp/ppp.conf.sample Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/ppp/ppp.conf.sample Mon Nov 30 14:15:29 1998 @@ -4,7 +4,7 @@ # # Originally written by Toshiharu OHNO # -# $Id: ppp.conf.sample,v 1.5.2.14 1998/04/02 09:30:11 danny Exp $ +# $Id: ppp.conf.sample,v 1.5.2.16 1998/11/26 12:43:27 jkh Exp $ # ################################################################# @@ -25,10 +25,9 @@ # so that subsequent commands are logged. # default: - set log Phase Chat Connect Carrier LCP IPCP CCP tun command + set log Phase Chat LCP IPCP CCP tun command set device /dev/cuaa1 set speed 115200 - deny lqr set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT" # Client side PPP @@ -43,30 +42,32 @@ # 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. +# some IPs that you can't currently route to. # # 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 fourth arg to "set ifaddr" makes us send "0.0.0.0" as our requested +# 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. # +# This entry also works with static IP numbers or when not in -auto mode. +# The ``add'' line adds a `sticky' default route that will be updated if +# and when any of the IP numbers are changed in IPCP negotiations. +# The "set ifaddr" is required in -auto mode. +# +# Finally, the ``enable dns'' bit tells ppp to ask the peer for the +# nameserver addresses that should be used. This isn't always supported +# by the other side, but if it is, /etc/resolv.conf will automatically be +# updated. +# pmdemand: set phone 1234567 - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp" + set login "ABORT NO\\sCARRIER 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 + add default HISADDR + enable dns # 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 @@ -79,8 +80,8 @@ 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 + add default HISADDR + enable dns # On demand dialup example with static IP addresses: # Here, the local side uses 192.244.185.226 and the remote side @@ -88,17 +89,17 @@ # # # 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. +# With static IP numbers, our setup is similar to dynamic: +# Remember, ppp.linkup is searched for a "192.244.176.44" label, then +# a "ondemand" label, and finally the "MYADDR" label. # ondemand: set phone 1234567 - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp" + set login "ABORT NO\\sCARRIER 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 + set ifaddr 192.244.185.226 192.244.176.44 + add default HISADDR + enable dns # Example segments # @@ -114,17 +115,16 @@ # set phone 12345678|12345679:12345670|12345671 # -# 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: +# 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 + set server /var/tmp/internet MySecretPassword 0177 # # Although a TCP port may be used if you want to allow control # connections from other machines: # - set server 6670 + set server 6670 MySecretpassword # # If you don't like ppp's builtin chat, use an external one: # @@ -144,20 +144,28 @@ 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): +# try this (see the man page): # - set openmode passive + set openmode active 5 # # For noisy lines, we may want to reconnect (up to 20 times) after loss -# of carrier: +# of carrier, with 3 second delays between each attempt: # set reconnect 3 20 # -# When playing server for M$ clients, tell them who our name servers are: +# When playing server for M$ clients, tell them who our NetBIOS 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 +# +# Inform the client if they ask for our DNS IP numbers: +# + enable dns +# +# If you don't want to tell them what's in your /etc/resolf.conf file +# with `enable dns', override the values: +# + set dns 10.0.0.1 10.0.0.2 # # If we're using the -alias switch, redirect ftp and http to an internal # machine: @@ -174,7 +182,8 @@ 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: +# I empty out the user access list in that section so that only root can +# have access: # allow users # @@ -188,15 +197,19 @@ # # 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 + set filter alive 0 deny icmp + set filter alive 1 deny udp src eq 53 + set filter alive 2 deny udp dst eq 53 + set filter alive 3 permit 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 + set filter dial 0 deny icmp + set filter dial 1 permit 0 0 +# +# or any TCP SYN or RST packets (badly closed TCP channels): +# + set filter dial 2 deny 0 0 tcp syn finrst # # 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), @@ -204,28 +217,28 @@ # # 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 + set filter in 0 permit tcp dst eq 113 + set filter out 0 permit tcp src eq 113 + set filter in 1 permit tcp src eq 23 estab + set filter out 1 permit tcp dst eq 23 + set filter in 2 permit tcp src eq 21 estab + set filter out 2 permit tcp dst eq 21 + set filter in 3 permit tcp src eq 20 dst gt 1023 + set filter out 3 permit tcp dst eq 20 + set filter in 4 permit udp src eq 53 + set filter out 4 permit udp dst eq 53 + set filter in 5 permit 192.244.191.0/24 0/0 + set filter out 5 permit 0/0 192.244.191.0/24 + set filter in 6 permit icmp + set filter out 6 permit icmp + set filter in 7 permit udp dst gt 33433 + set filter out 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 +# PAP are disabled by default (we usually only "enable" one of them if the # other side is dialing into our server). # When the peer authenticates itself, we use ppp.secret for verification. # @@ -233,65 +246,90 @@ # # ppp -direct CHAPserver # # Note: We can supply a third field in ppp.secret specifying the IP address -# for that user. +# for that user. We can even specify a forth field to specify the +# ppp.link{up,down} label to use. # CHAPserver: enable chap enable proxy set ifaddr 192.244.176.44 292.244.184.31 + accept dns # If we wish to act as a server, allowing PAP access according to -# accounts in /etc/passwd, we do this: +# accounts in /etc/passwd, we do this (Without `enable passwdauth', +# you may still enter ``*'' as the users password in ppp.secret and +# ppp will look it up in the passwd database. This is useful if you +# need to assign a special label or IP number or range): # PAPServerwithPASSWD: enable pap enable passwdauth enable proxy set ifaddr 192.244.176.44 292.244.184.31 + accept dns # 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 +# Here, the server sends lqr's every 10 seconds and quits if five in a # row fail. # # Make sure you don't have "deny lqr" in your default: on the client ! +# If the peer denies LQR, we still send ECHO LQR packets at the given +# lqrperiod interval (ppp-style-pings). # direct-client: set dial "" set line /dev/cuaa0 set sp 115200 - set timeout 900 10 3 + set timeout 900 + set lqrperiod 10 set log Phase Chat LQM - set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp HELLO" + set login "ABORT NO\\sCARRIER TIMEOUT 5 ogin:--ogin: ppp word: ppp HELLO" set ifaddr 10.0.4.2 10.0.4.1 enable lqr accept lqr direct-server: - set timeout 900 10 3 + set timeout 0 + set lqrperiod 10 set log Phase LQM set ifaddr 10.0.4.1 10.0.4.2 enable lqr accept lqr +# Example to connect via compuserve (who insist on 7 bits even parity +# during the chat phase). +# +compuserve: + set phone 1234567 + set parity even + set login "TIMEOUT 10 \"\" \"\" Name: CIS ID: 99999,9999/go:pppconnect \ + word: XXXXXXXX" + set timeout 300 + set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0 + delete ALL + add default HISADDR + + # 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 # +# Note, we assume we're using a binary-clean connection. If something +# such as `rlogin' is involved, you may need to ``set escape 0xff'' +# tcp-client: set device tcpsrv.mynet:1234 set dial set login - set escape 0xff set ifaddr 10.0.5.1 10.0.4.1 255.255.255.0 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: @@ -308,13 +346,85 @@ 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 + set log phase lcp ipcp command + allow mode direct + +# If you're going to create a tunnel through a public network, your VPN +# should be set up something like this: +# +# /etc/ppp/secure (which should be executable) says: +# #! /bin/sh +# exec ssh whatevermachine /usr/sbin/ppp -direct loop-in +# +sloop: + load loop + set device !/etc/ppp/secure + +# If you wish to connect to a server that will dial back *without* using +# the ppp callback facility (rfc1570), take advantage of the fact that +# ppp doesn't look for carrier 'till `set login' is complete: +# +# Here, we expect the server to say DIALBACK then disconnect after +# we've authenticated ourselves. When this has happened, we wait +# 60 seconds for a RING. +# +dialback: + set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" ATZ OK-ATZ-OK \ + ATDT\\T TIMEOUT 60 CONNECT" + set login "TIMEOUT 5 ogin:--ogin: ppp word: ppp TIMEOUT 15 DIALBACK \ + \"\" NO\\sCARRIER \"\" TIMEOUT 60 RING ATA CONNECT" + +# Alternatively, if the peer is using the PPP callback protocol, use +# normal dial and login scripts and add +# + set callback auth cbcp e.164 1234567 + set cbcp 1234567 + +# If we're running a ppp server that wants to only call back microsoft +# clients on numbers configured in /etc/ppp/ppp.secret (the 5th field): +# + set callback cbcp + set cbcp + set log +cbcp + set redial 3 1 + set device /dev/cuaa0 + set speed 115200 + set dial "TIMEOUT 10 \"\" AT OK-AT-OK ATDT\\T CONNECT" + +# Or if we want to allow authenticated clients to specify their own +# callback number, use this ``set cbcp'' line instead: +# + set cbcp * + +# Multilink mode is available (rfc1990). +# To enable multilink capabilities, you must specify a MRRU. 1500 is +# a reasonable value. To create new links, use the ``clone'' command +# to duplicate an existing link. If you already have more than one +# link, you must specify which link you wish to run the command on via +# the ``link'' command. +# +# You can now ``dial'' specific links, or even dial all links at the +# same time. The `dial' command may also be prefixed with a specific +# link that should do the dialing. +# + +mloop: + load loop + set mode interactive + set mrru 1500 + clone 1 2 3 + link deflink remove + # dial + # link 2 dial + # link 3 dial + +mloop-in: + set timeout 0 + set log tun phase allow mode direct + set mrru 1500 diff -urN 2.2.7-RELEASE/etc/ppp/ppp.deny 2.2.8-RELEASE/etc/ppp/ppp.deny --- 2.2.7-RELEASE/etc/ppp/ppp.deny Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/ppp/ppp.deny Mon Nov 30 14:15:29 1998 @@ -1,3 +1,5 @@ +# $Id: ppp.deny,v 1.1.2.2 1998/11/26 12:43:27 jkh Exp $ +# # list of users disallowed any pppd access via 'system # password login'. # read by pppd(8). diff -urN 2.2.7-RELEASE/etc/ppp/ppp.linkdown.sample 2.2.8-RELEASE/etc/ppp/ppp.linkdown.sample --- 2.2.7-RELEASE/etc/ppp/ppp.linkdown.sample Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/ppp/ppp.linkdown.sample Mon Nov 30 14:15:29 1998 @@ -12,7 +12,7 @@ # 3) If no label has been found, use MYADDR if it exists. # # -# $Id: ppp.linkdown.sample,v 1.1.2.1 1998/01/30 19:54:37 brian Exp $ +# $Id: ppp.linkdown.sample,v 1.1.2.2 1998/11/26 12:43:27 jkh 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 diff -urN 2.2.7-RELEASE/etc/ppp/ppp.linkup.sample 2.2.8-RELEASE/etc/ppp/ppp.linkup.sample --- 2.2.7-RELEASE/etc/ppp/ppp.linkup.sample Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/ppp/ppp.linkup.sample Mon Nov 30 14:15:29 1998 @@ -12,40 +12,34 @@ # 3) If no label has been found, use MYADDR if it exists. # # -# $Id: ppp.linkup.sample,v 1.3.2.5 1998/01/30 19:54:38 brian Exp $ +# $Id: ppp.linkup.sample,v 1.3.2.6 1998/11/26 12:43:27 jkh Exp $ # ######################################################################### -# By default, simply delete any existing default route and add the peer -# as default gateway. +# It is no longer necessary to re-add the default route here as our +# ppp.conf route is `sticky' (see the man page). # 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. +# to 192.244.176.0 network. This may also be done in ppp.conf instead. # 192.244.176.32: add 192.244.176.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 also want to execute a script on startup. This script can do +#You may want to execute a script after connecting. 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 # as arguments too - useful for informing a DNS of your assigned IP. # +# You may also want some sound effects.... +# pmdemand: - delete ALL - add 0 0 HISADDR !bg /etc/ppp/ppp.etherup.pmdemand + ! sh -c "cat /etc/ppp/linkup.au >/dev/audio" # 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 diff -urN 2.2.7-RELEASE/etc/ppp/ppp.secret.sample 2.2.8-RELEASE/etc/ppp/ppp.secret.sample --- 2.2.7-RELEASE/etc/ppp/ppp.secret.sample Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/ppp/ppp.secret.sample Mon Nov 30 14:15:29 1998 @@ -5,19 +5,37 @@ # 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. +# Additionally, if ``passwdauth'' is enabled and an entry isn't +# found in this file, the passwd(5) database is used. +# +# If the password is specified as "*", look it up in passwd(5). +# This doesn't work for CHAP connections as ppp must have access +# to the unencrypted password for CHAP. +# +# If an IP address or address range is given as the third field, it +# will be assigned to the peer. A ``*'' or an empty field may be +# used as a placeholder if you do not wish to override the IP +# address, but wish to specify further fields. # -# $Id: ppp.secret.sample,v 1.2.6.1 1998/01/30 19:54:38 brian Exp $ +# If a label is given as the forth field, it is used when reading +# the ppp.linkup and ppp.linkdown files. A ``*'' or an empty field +# can be used as a placeholder if you do not wish to override the +# label, but wish to specify further fields. +# +# If a phone number or list of phone numbers is given as the fifth +# field, these numbers will be used to call back the client if +# ``auth'' or ``cbcp'' callback is enabled (see ``set callback''). +# A ``*'' specifies that the client must specify the number. +# +# $Id: ppp.secret.sample,v 1.2.6.2 1998/11/26 12:43:27 jkh Exp $ # ################################################## -# Authname Authkey Peer's IP address +# Authname Authkey Peer's IP address Label Callback -oscar OurSecretKey 192.244.184.34/24 -BigBird X4dWg9327 192.244.184.33/32 -tama localPasswdForControl +oscar OurSecretKey 192.2.18.34 +BigBird X4dWg9327 192.2.18.33/32 +fred * * fred +subnet * 192.2.18.35-192.2.18.70 subnet +admin * * * * +homeworker * * * 1234567 diff -urN 2.2.7-RELEASE/etc/ppp/ppp.shells.sample 2.2.8-RELEASE/etc/ppp/ppp.shells.sample --- 2.2.7-RELEASE/etc/ppp/ppp.shells.sample Wed Jul 22 17:16:40 1998 +++ 2.2.8-RELEASE/etc/ppp/ppp.shells.sample Mon Nov 30 14:15:29 1998 @@ -1,3 +1,5 @@ +# $Id: ppp.shells.sample,v 1.1.2.2 1998/11/26 12:43:27 jkh Exp $ +# # List of acceptable shells for pppd(8). # Pppd will not accept a system password login # by a user whose shell is not listed below. diff -urN 2.2.7-RELEASE/etc/profile 2.2.8-RELEASE/etc/profile --- 2.2.7-RELEASE/etc/profile Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/profile Mon Nov 30 14:15:14 1998 @@ -1,3 +1,5 @@ +# $Id: profile,v 1.8.2.3 1998/09/03 22:14:37 brian Exp $ +# # System-wide .profile file for sh(1). # Uncomment this to give you the default 4.2 behavior, where disk # information is shown in K-Blocks Binary files 2.2.7-RELEASE/etc/pwd.db and 2.2.8-RELEASE/etc/pwd.db differ diff -urN 2.2.7-RELEASE/etc/rc 2.2.8-RELEASE/etc/rc --- 2.2.7-RELEASE/etc/rc Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/rc Mon Nov 30 14:15:14 1998 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.104.2.34 1998/06/04 00:20:34 mph Exp $ +# $Id: rc,v 1.104.2.38 1998/11/03 16:35:46 cracauer Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -84,7 +84,7 @@ # If there is a global system configuration file, suck it in. if [ -f /etc/rc.conf ]; then - . /etc/rc.conf + . /etc/rc.conf fi # If old file exists, whine until they fix it. @@ -95,10 +95,25 @@ adjkerntz -i -rm -rf /var/run/* +clean_var() { + if [ ! -f /var/run/clean_var ]; then + rm -rf /var/run/* + rm -f /var/spool/lock/* + rm -rf /var/spool/uucp/.Temp/* + # Keep a copy of the boot messages around + dmesg >/var/run/dmesg.boot + # And an initial utmp file + (cd /var/run && cp /dev/null utmp && chmod 644 utmp; ) + >/var/run/clean_var + fi +} -# Keep a copy of the boot messages around -dmesg > /var/run/dmesg.boot +if [ -d /var/run -a -d /var/spool/lock -a -d /var/spool/uucp/.Temp ]; then + # network_pass1() *may* end up writing stuff to /var - we don't want to + # remove it immediately afterwards - *nor* to we want to fail to clean + # an nfs-mounted /var. + clean_var +fi # Add additional swapfile, if configured. if [ "x$swapfile" != "xNO" -a -w "$swapfile" -a -b /dev/vn0b ]; then @@ -129,9 +144,9 @@ # clean up left-over files rm -f /etc/nologin -rm -f /var/spool/lock/* -rm -rf /var/spool/uucp/.Temp/* -(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; }) + +clean_var # If it hasn't already been done +rm /var/run/clean_var # # Clearing /tmp at boot-time seems to have a long tradition. It doesn't @@ -147,13 +162,14 @@ # 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 -- {} \;) + 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 +# Remove X lock files, since they will prevent you from restarting X11 +# 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 @@ -189,7 +205,7 @@ fi if [ -n "$network_pass1_done" ]; then - network_pass2 + network_pass2 fi # Check the quotas (must be after ypbind if using NIS) @@ -201,7 +217,7 @@ fi if [ -n "$network_pass2_done" ]; then - network_pass3 + network_pass3 fi @@ -307,7 +323,8 @@ echo -n 'Local package initialization:' for dir in ${local_startup}; do [ -d ${dir} ] && for script in ${dir}/*.sh; do - [ -x ${script} ] && ${script} start + [ -x ${script} ] && \ + (trap 'exit 1' 2 ; ${script} start ; echo -n) done done echo . diff -urN 2.2.7-RELEASE/etc/rc.conf 2.2.8-RELEASE/etc/rc.conf --- 2.2.7-RELEASE/etc/rc.conf Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/rc.conf Mon Nov 30 14:15:14 1998 @@ -6,7 +6,7 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.1.2.45 1998/06/27 21:23:17 steve Exp $ +# $Id: rc.conf,v 1.1.2.48 1998/11/25 21:51:34 msmith Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -52,6 +52,7 @@ amd_flags="-a /net -c 1800 -k i386 -d my.domain -l syslog /host /etc/amd.map" nfs_client_enable="NO" # This host is an NFS client (or NO). nfs_client_flags="-n 4" # Flags to nfsiod (if enabled). +nfs_access_cache="0" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t 4" # Flags to nfsd (if enabled). mountd_flags="-r" # Flags to mountd (if NFS server enabled). @@ -93,7 +94,7 @@ defaultrouter="NO" # Set to default gateway (or NO). static_routes="" # Set to static route list (or leave empty). gateway_enable="NO" # Set to YES if this host will be a gateway. -router_enable="YES" # Set to YES to enable a routing daemon. +router_enable="NO" # Set to YES to enable a routing daemon. 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). @@ -128,6 +129,7 @@ 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. +allscreens_flags="" # Set this vidcontrol mode for all virtual screens ############################################################## diff -urN 2.2.7-RELEASE/etc/rc.i386 2.2.8-RELEASE/etc/rc.i386 --- 2.2.7-RELEASE/etc/rc.i386 Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/rc.i386 Mon Nov 30 14:15:14 1998 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.i386,v 1.18.2.10 1998/03/07 09:06:19 jkh Exp $ +# $Id: rc.i386,v 1.18.2.11 1998/10/22 08:36:32 jkh Exp $ # Do i386 specific processing # @@ -103,6 +103,15 @@ echo -n ' moused' moused ${moused_flags} -p ${moused_port} -t ${moused_type} vidcontrol <${viddev} -m on +fi + +# set this mode for all virtual screens +if [ "X${allscreens_flags}" != X"" ] ; then + echo -n ' allscreens' + for ttyv in /dev/ttyv* + do + vidcontrol <$ttyv ${allscreens_flags} + done fi echo '.' diff -urN 2.2.7-RELEASE/etc/rc.network 2.2.8-RELEASE/etc/rc.network --- 2.2.7-RELEASE/etc/rc.network Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/rc.network Mon Nov 30 14:15:14 1998 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $Id: rc.network,v 1.1.2.21 1998/06/27 21:23:20 steve Exp $ +# $Id: rc.network,v 1.1.2.24 1998/11/28 22:04:20 jkh Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # Note that almost all the user-configurable behavior is no longer in @@ -225,6 +225,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 @@ -244,10 +248,10 @@ stash_flag= fi echo -n ' kerberos'; \ - kerberos ${stash_flags} >> /var/log/kerberos.log & + kerberos ${stash_flag} >> /var/log/kerberos.log & if [ "X${kadmind_server_enable}" = "XYES" ]; then echo -n ' kadmind'; \ - (sleep 20; kadmind ${stash_flags} >/dev/null 2>&1 &) & + (sleep 20; kadmind ${stash_flag} >/dev/null 2>&1 &) & fi unset stash_flag fi diff -urN 2.2.7-RELEASE/etc/rc.pccard 2.2.8-RELEASE/etc/rc.pccard --- 2.2.7-RELEASE/etc/rc.pccard Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/rc.pccard Mon Nov 30 14:15:14 1998 @@ -3,6 +3,8 @@ # PC-card startup script # HOSOKAWA, Tatsumi # +# $Id: rc.pccard,v 1.1.4.3 1998/08/12 23:46:35 brian Exp $ +# if [ "X$pccard_enable" = X"YES" ] ; then if [ "x$pccard_mem" != "xDEFAULT" ] ; then diff -urN 2.2.7-RELEASE/etc/remote 2.2.8-RELEASE/etc/remote --- 2.2.7-RELEASE/etc/remote Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/remote Mon Nov 30 14:15:14 1998 @@ -1,3 +1,5 @@ +# $Id: remote,v 1.6.6.3 1998/09/03 22:14:37 brian Exp $ +# # @(#)remote 5.2 (Berkeley) 6/30/90 # # remote -- remote host description file diff -urN 2.2.7-RELEASE/etc/rpc 2.2.8-RELEASE/etc/rpc --- 2.2.7-RELEASE/etc/rpc Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/rpc Mon Nov 30 14:15:14 1998 @@ -1,4 +1,5 @@ # +# $Id: rpc,v 1.3.2.3 1998/09/03 22:14:37 brian Exp $ # rpc 88/08/01 4.0 RPCSRC; from 1.12 88/02/07 SMI # portmapper 100000 portmap sunrpc diff -urN 2.2.7-RELEASE/etc/sendmail.cf 2.2.8-RELEASE/etc/sendmail.cf --- 2.2.7-RELEASE/etc/sendmail.cf Wed Jul 22 17:16:25 1998 +++ 2.2.8-RELEASE/etc/sendmail.cf Mon Nov 30 14:15:15 1998 @@ -37,7 +37,7 @@ ##### ##### SENDMAIL CONFIGURATION FILE ##### -##### built by root@builder.cdrom.com on Wed Jul 22 07:57:41 GMT 1998 +##### built by root@time.cdrom.com on Mon Nov 30 04:52:54 GMT 1998 ##### in /usr/src/usr.sbin/sendmail/cf/cf ##### using ../ as configuration include directory ##### diff -urN 2.2.7-RELEASE/etc/services 2.2.8-RELEASE/etc/services --- 2.2.7-RELEASE/etc/services Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/services Mon Nov 30 14:15:14 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.21 1998/07/04 22:13:30 jdp Exp $ +# $Id: services,v 1.27.2.23 1998/09/05 20:43:28 obrien Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1489,6 +1489,7 @@ #dls 2047/udp dls-monitor 2048/tcp dls-monitor 2048/udp +nfsd 2049/tcp nfs # NFS server daemon nfsd 2049/udp nfs # NFS server daemon #PROBLEMS!============================================================= #shilp 2049/tcp @@ -1533,7 +1534,6 @@ listen 2766/tcp # System V listener port www-dev 2784/tcp #world wide web - development www-dev 2784/udp #world wide web - development -ppp 3000/tcp #User-level ppp daemon NSWS 3049/tcp NSWS 3049/udp sj3 3086/tcp #SJ3 (kanji input) diff -urN 2.2.7-RELEASE/etc/shells 2.2.8-RELEASE/etc/shells --- 2.2.7-RELEASE/etc/shells Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/shells Mon Nov 30 14:15:14 1998 @@ -1,3 +1,5 @@ +# $Id: shells,v 1.1.10.1 1998/09/03 22:14:37 brian Exp $ +# # List of acceptable shells for chpass(1). # Ftpd will not allow users to connect who are not using # one of these shells. diff -urN 2.2.7-RELEASE/etc/syslog.conf 2.2.8-RELEASE/etc/syslog.conf --- 2.2.7-RELEASE/etc/syslog.conf Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/syslog.conf Mon Nov 30 14:15:14 1998 @@ -1,3 +1,7 @@ +# $Id: syslog.conf,v 1.4.2.5 1998/10/14 22:02:58 nate Exp $ +# +# Spaces are NOT valid field separators in this file. +# Consult the syslog.conf(5) manpage. *.err;kern.debug;auth.notice;mail.crit /dev/console *.notice;kern.debug;lpr.info;mail.crit;news.err /var/log/messages mail.info /var/log/maillog diff -urN 2.2.7-RELEASE/etc/ttys 2.2.8-RELEASE/etc/ttys --- 2.2.7-RELEASE/etc/ttys Wed Jul 22 17:16:24 1998 +++ 2.2.8-RELEASE/etc/ttys Mon Nov 30 14:15:14 1998 @@ -1,4 +1,5 @@ # +# $Id: ttys,v 1.16.2.2 1998/09/03 22:14:37 brian Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # name getty type status comments diff -urN 2.2.7-RELEASE/etc/uucp/dial.sample 2.2.8-RELEASE/etc/uucp/dial.sample --- 2.2.7-RELEASE/etc/uucp/dial.sample Wed Jul 22 17:16:25 1998 +++ 2.2.8-RELEASE/etc/uucp/dial.sample Mon Nov 30 14:15:15 1998 @@ -1,3 +1,5 @@ +# $Id: dial.sample,v 1.2.8.1 1998/09/13 23:10:49 brian Exp $ + # This is an example of dial, the dialer configuration file for Taylor # UUCP. To use it, you must compile the package with # HAVE_TAYLOR_CONFIG set to 1 in policy.h (that is the default), copy