diff options
41 files changed, 112 insertions, 74 deletions
diff --git a/etc/MAKEDEV.local b/etc/MAKEDEV.local index 3e06d0a73df..4e2722bf60a 100644 --- a/etc/MAKEDEV.local +++ b/etc/MAKEDEV.local @@ -1,5 +1,7 @@ #!/bin/sh - # +# $OpenBSD: MAKEDEV.local,v 1.2 1996/05/26 10:25:15 deraadt Exp $ +# # Copyright (c) 1991 The Regents of the University of California. # All rights reserved. # diff --git a/etc/Makefile b/etc/Makefile index d485fa32c56..a583976105b 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.51 1995/11/01 13:52:40 pk Exp $ -# from: @(#)Makefile 5.11 (Berkeley) 5/21/91 +# $OpenBSD: Makefile,v 1.11 1996/05/26 10:25:16 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= US/Pacific diff --git a/etc/aliases b/etc/aliases index b77e0ac36a0..1ff32e2da3f 100644 --- a/etc/aliases +++ b/etc/aliases @@ -1,5 +1,5 @@ # -# @(#)aliases 5.3 (Berkeley) 5/24/90 +# $OpenBSD: aliases,v 1.2 1996/05/26 10:25:17 deraadt Exp $ # # Aliases in this file will NOT be expanded in the header from # Mail, but WILL be visible over networks or from /bin/mail. diff --git a/etc/bootptab b/etc/bootptab index f1a98ab9482..db0a1aeba80 100644 --- a/etc/bootptab +++ b/etc/bootptab @@ -1,3 +1,5 @@ +# $OpenBSD: bootptab,v 1.2 1996/05/26 10:25:17 deraadt Exp $ +# # /etc/bootptab: database for bootp server (/etc/bootpd) # Last update Mon 11/7/88 18:03 # Blank lines and lines beginning with '#' are ignored. @@ -7,27 +9,37 @@ # first field -- hostname # (may be full domain name and probably should be) # -# hd -- home directory -# bf -- bootfile -# cs -- cookie servers -# df -- dumpfile -# dn -- domain name -# ds -- domain name servers -# gw -- gateways -# ha -- hardware address -# ht -- hardware type -# im -- impress servers -# ip -- host IP address -# lg -- log servers -# lp -- LPR servers -# ns -- IEN-116 name servers -# rl -- resource location protocol servers -# rp -- root path -# sm -- subnet mask -# sw -- swap server -# tc -- template host (points to similar host entry) -# to -- time offset (seconds) -# ts -- time servers +# bf Bootfile +# bs Bootfile size in 512-octet blocks +# cs Cookie server address list +# df Merit dump file +# dn Domain name +# ds Domain name server address list +# ef Extension file +# gw Gateway address list +# ha Host hardware address +# hd Bootfile home directory +# hn Send client's hostname to client +# ht Host hardware type (see Assigned Numbers RFC) +# im Impress server address list +# ip Host IP address +# lg Log server address list +# lp LPR server address list +# ns IEN-116 name server address list +# nt NTP (time) Server (RFC 1129) +# ra Reply address override +# rl Resource location protocol server address list +# rp Root path to mount as root +# sa TFTP server address client should use +# sm Host subnet mask +# sw Swap server address +# tc Table continuation (points to similar "template" host entry) +# td TFTP root directory used by "secure" TFTP servers +# to Time offset in seconds from UTC +# ts Time server address list +# vm Vendor magic cookie selector +# yd YP (NIS) domain name +# ys YP (NIS) server address # # Be careful about including backslashes where they're needed. Weird (bad) diff --git a/etc/changelist b/etc/changelist index 20283fc976e..b9249a4db0d 100644 --- a/etc/changelist +++ b/etc/changelist @@ -1,5 +1,4 @@ -# from: @(#)changelist 8.1 (Berkeley) 6/9/93 -# $Id: changelist,v 1.1 1995/10/18 08:37:56 deraadt Exp $ +# $OpenBSD: changelist,v 1.2 1996/05/26 10:25:18 deraadt Exp $ # # List of files which the security script backs up and checks # for modifications. diff --git a/etc/crontab b/etc/crontab index 085bd54ea44..af30633c109 100644 --- a/etc/crontab +++ b/etc/crontab @@ -1,7 +1,6 @@ -# $OpenBSD: crontab,v 1.2 1996/03/28 18:24:33 niklas Exp $ -# $NetBSD: crontab,v 1.10 1996/02/18 12:08:26 mycroft Exp $ +# $OpenBSD: crontab,v 1.3 1996/05/26 10:25:18 deraadt Exp $ # -# /var/cron/tabs/root - root's crontab for NetBSD +# /var/cron/tabs/root - root's crontab # SHELL=/bin/sh PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin diff --git a/etc/csh.cshrc b/etc/csh.cshrc index 4a3bf3ff3e9..b6ef8d8ec0a 100644 --- a/etc/csh.cshrc +++ b/etc/csh.cshrc @@ -1 +1,3 @@ +# $OpenBSD: csh.cshrc,v 1.2 1996/05/26 10:25:19 deraadt Exp $ +# # System-wide .cshrc file for csh(1). diff --git a/etc/csh.login b/etc/csh.login index 0b573ff50da..313148b3fc9 100644 --- a/etc/csh.login +++ b/etc/csh.login @@ -1 +1,3 @@ +# $OpenBSD: csh.login,v 1.2 1996/05/26 10:25:19 deraadt Exp $ +# # System-wide .login file for csh(1). diff --git a/etc/csh.logout b/etc/csh.logout index f8601c07d9c..77b84db9119 100644 --- a/etc/csh.logout +++ b/etc/csh.logout @@ -1 +1,3 @@ +# $OpenBSD: csh.logout,v 1.2 1996/05/26 10:25:20 deraadt Exp $ +# # System-wide .logout file for csh(1). diff --git a/etc/daily b/etc/daily index 279a7345079..4672b94b709 100644 --- a/etc/daily +++ b/etc/daily @@ -1,6 +1,6 @@ #!/bin/sh - # -# @(#)daily 5.12 (Berkeley) 5/24/91 +# $OpenBSD: daily,v 1.4 1996/05/26 10:25:20 deraadt Exp $ # PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local host=`hostname -s` diff --git a/etc/dm.conf b/etc/dm.conf index 48c24de51f8..3667f11e7eb 100644 --- a/etc/dm.conf +++ b/etc/dm.conf @@ -1,6 +1,6 @@ +# $OpenBSD: dm.conf,v 1.2 1996/05/26 10:25:21 deraadt Exp $ # # Game Control File -# @(#)dm.conf 5.5 (Berkeley) 4/12/89 # # TTYNAME diff --git a/etc/ftpchroot b/etc/ftpchroot index c008ec510e6..fd10c75f28d 100644 --- a/etc/ftpchroot +++ b/etc/ftpchroot @@ -1,3 +1,5 @@ +# $OpenBSD: ftpchroot,v 1.2 1996/05/26 10:25:21 deraadt Exp $ +# # list of users given ftp access to a chrooted area. # read by ftpd(8). joeuser diff --git a/etc/ftpusers b/etc/ftpusers index d23c64ac3a5..254f37d83bf 100644 --- a/etc/ftpusers +++ b/etc/ftpusers @@ -1,3 +1,5 @@ +# $OpenBSD: ftpusers,v 1.2 1996/05/26 10:25:22 deraadt Exp $ +# # list of users disallowed any ftp access. # read by ftpd(8). root diff --git a/etc/gettytab b/etc/gettytab index 484c32d212c..40e810f3d3d 100644 --- a/etc/gettytab +++ b/etc/gettytab @@ -1,4 +1,4 @@ -# from: @(#)gettytab 5.14 (Berkeley) 3/27/91 +# $OpenBSD: gettytab,v 1.2 1996/05/26 10:25:22 deraadt Exp $ # # Most of the table entries here are just copies of the old getty table, # it is by no means certain, or even likely, that any of them are optimal diff --git a/etc/hosts b/etc/hosts index 29402c5849e..f14f90bc0c0 100644 --- a/etc/hosts +++ b/etc/hosts @@ -1,3 +1,4 @@ +# $OpenBSD: hosts,v 1.2 1996/05/26 10:25:23 deraadt Exp $ # # Host Database # This file should contain the addresses and aliases @@ -6,7 +7,7 @@ # before the nameserver is started. # # -127.1 localhost localhost.my.domain +127.0.0.1 localhost localhost.my.domain # # Imaginary network. 0.2 myname.my.domain myname diff --git a/etc/inetd.conf b/etc/inetd.conf index adb7ebb3eb7..b04a13760b8 100644 --- a/etc/inetd.conf +++ b/etc/inetd.conf @@ -1,8 +1,7 @@ +# $OpenBSD: inetd.conf,v 1.6 1996/05/26 10:25:23 deraadt Exp $ # # Internet server configuration database # -# @(#)inetd.conf 5.4 (Berkeley) 6/30/90 -# ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l telnet stream tcp nowait root /usr/libexec/telnetd telnetd shell stream tcp nowait root /usr/libexec/rshd rshd diff --git a/etc/ipf.rules b/etc/ipf.rules index 24ed030709a..f74c3fc2b59 100644 --- a/etc/ipf.rules +++ b/etc/ipf.rules @@ -1,3 +1,4 @@ +# $OpenBSD: ipf.rules,v 1.2 1996/05/26 10:25:24 deraadt Exp $ # # IP filtering rules. See the ipf(5) man page for more # information on the format of this file, and /usr/share/ipf diff --git a/etc/man.conf b/etc/man.conf index 0427766ab01..dcb275facb8 100644 --- a/etc/man.conf +++ b/etc/man.conf @@ -1,4 +1,4 @@ -# $NetBSD: man.conf,v 1.6 1995/12/17 01:56:55 thorpej Exp $ +# $OpenBSD: man.conf,v 1.3 1996/05/26 10:25:33 deraadt Exp $ # Sheer, raging paranoia... _version BSD.2 diff --git a/etc/monthly b/etc/monthly index a545d8cef16..8e0cb75af68 100644 --- a/etc/monthly +++ b/etc/monthly @@ -1,7 +1,5 @@ #!/bin/sh - -# -# @(#)monthly 5.5 (Berkeley) 6/17/91 -# +# $OpenBSD: monthly,v 1.3 1996/05/26 10:25:32 deraadt Exp $ host=`hostname -s` echo "Subject: $host monthly run output" @@ -1,4 +1,4 @@ -NetBSD ?.? (UNKNOWN) +OpenBSD ?.? (UNKNOWN) Welcome to OpenBSD. diff --git a/etc/mrouted.conf b/etc/mrouted.conf index 82f9c3777b1..f63011f1bc3 100644 --- a/etc/mrouted.conf +++ b/etc/mrouted.conf @@ -1,4 +1,4 @@ -# $NetBSD: mrouted.conf,v 1.3 1995/12/10 10:11:09 mycroft Exp $ +# $OpenBSD: mrouted.conf,v 1.4 1996/05/26 10:25:33 deraadt Exp $ # # This is the configuration file for "mrouted", an IP multicast router. # mrouted looks for it in "/etc/mrouted.conf". diff --git a/etc/mtree/4.4BSD.dist b/etc/mtree/4.4BSD.dist index 05c900a0aaa..f3866adf509 100644 --- a/etc/mtree/4.4BSD.dist +++ b/etc/mtree/4.4BSD.dist @@ -1,5 +1,4 @@ -# from: @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 -# $Id: 4.4BSD.dist,v 1.13 1996/05/04 08:14:35 deraadt Exp $ +# $OpenBSD: 4.4BSD.dist,v 1.14 1996/05/26 10:26:15 deraadt Exp $ /set type=dir uname=root gname=wheel mode=0755 # . @@ -117,18 +116,18 @@ hide gname=games uname=games mode=0700 .. # ./usr/include -include gname=bin uname=bin mode=0555 +include gname=bin uname=bin mode=0755 # ./usr/include/arpa -arpa gname=bin uname=bin mode=0555 +arpa gname=bin uname=bin mode=0755 # ./usr/include/arpa .. # ./usr/include/g++ -g++ gname=bin uname=bin mode=0555 +g++ gname=bin uname=bin mode=0755 # ./usr/include/g++/gen -gen gname=bin uname=bin mode=0555 +gen gname=bin uname=bin mode=0755 # ./usr/include/g++/gen .. @@ -141,22 +140,22 @@ std gname=bin uname=bin mode=0555 .. # ./usr/include/kerberosIV -kerberosIV gname=bin uname=bin mode=0555 +kerberosIV gname=bin uname=bin mode=0755 # ./usr/include/kerberosIV .. # ./usr/include/protocols -protocols gname=bin uname=bin mode=0555 +protocols gname=bin uname=bin mode=0755 # ./usr/include/protocols .. # ./usr/include/rpc -rpc gname=bin uname=bin mode=0555 +rpc gname=bin uname=bin mode=0755 # ./usr/include/rpc .. # ./usr/include/rpcsvc -rpcsvc gname=bin uname=bin mode=0555 +rpcsvc gname=bin uname=bin mode=0755 # ./usr/include/rpcsvc .. @@ -1272,6 +1271,17 @@ mm # ./usr/share/tmac .. +# ./usr/share/vi +vi + +# ./usr/share/vi/catalog +catalog +# ./usr/share/vi/catalog +.. + +# ./usr/share/vi +.. + # ./usr/share/zoneinfo zoneinfo gname=bin uname=bin mode=0555 diff --git a/etc/mtree/4.4BSD.root b/etc/mtree/4.4BSD.root index 94314def1ca..0599aba843e 100644 --- a/etc/mtree/4.4BSD.root +++ b/etc/mtree/4.4BSD.root @@ -1,3 +1,6 @@ +# $OpenBSD: 4.4BSD.root,v 1.3 1996/05/26 10:26:15 deraadt Exp $ +# $NetBSD: 4.4BSD.root,v 1.2 1996/05/12 23:30:32 thorpej Exp $ +# # user: bostic # machine: vangogh.CS.Berkeley.EDU # tree: / diff --git a/etc/mtree/4.4BSD.usr b/etc/mtree/4.4BSD.usr index d3d6da23b5c..a1db19086b3 100644 --- a/etc/mtree/4.4BSD.usr +++ b/etc/mtree/4.4BSD.usr @@ -1,3 +1,6 @@ +# $OpenBSD: 4.4BSD.usr,v 1.5 1996/05/26 10:26:16 deraadt Exp $ +# $NetBSD: 4.4BSD.usr,v 1.3 1996/05/12 23:30:37 thorpej Exp $ +# # user: bostic # machine: vangogh.CS.Berkeley.EDU # tree: /usr diff --git a/etc/mtree/4.4BSD.var b/etc/mtree/4.4BSD.var index 3e21d9eb6ac..df5ea421428 100644 --- a/etc/mtree/4.4BSD.var +++ b/etc/mtree/4.4BSD.var @@ -1,3 +1,6 @@ +# $OpenBSD: 4.4BSD.var,v 1.2 1996/05/26 10:26:16 deraadt Exp $ +# $NetBSD: 4.4BSD.var,v 1.3 1996/05/12 23:30:47 thorpej Exp $ +# # user: bostic # machine: vangogh.CS.Berkeley.EDU # tree: /var diff --git a/etc/netstart b/etc/netstart index 083167f053f..7fc7bfe24e3 100644 --- a/etc/netstart +++ b/etc/netstart @@ -1,7 +1,6 @@ #!/bin/sh - # -# $NetBSD: netstart,v 1.23 1995/12/30 01:30:03 thorpej Exp $ -# @(#)netstart 5.9 (Berkeley) 3/30/91 +# $OpenBSD: netstart,v 1.5 1996/05/26 10:25:24 deraadt Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=-q diff --git a/etc/networks b/etc/networks index 71aeb5b05a5..ae15f1b4f61 100644 --- a/etc/networks +++ b/etc/networks @@ -1,4 +1,4 @@ -# @(#)networks 5.1 (Berkeley) 6/30/90 +# $OpenBSD: networks,v 1.2 1996/05/26 10:25:25 deraadt Exp $ # # Your Local Networks Database # diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf index 76ab863d447..4f14f5adffb 100644 --- a/etc/newsyslog.conf +++ b/etc/newsyslog.conf @@ -1,5 +1,6 @@ +# $OpenBSD: newsyslog.conf,v 1.2 1996/05/26 10:25:25 deraadt Exp $ +# # configuration file for newsyslog -# $Id: newsyslog.conf,v 1.1 1995/10/18 08:37:57 deraadt Exp $ # # logfilename owner.group mode ngen size time [ZB] /var/cron/log root.wheel 600 3 10 * Z diff --git a/etc/phones b/etc/phones index 941b0edc15f..b868386f34a 100644 --- a/etc/phones +++ b/etc/phones @@ -1,4 +1,4 @@ -# @(#)phones 5.2 (Berkeley) 6/30/90 +# $OpenBSD: phones,v 1.2 1996/05/26 10:25:25 deraadt Exp $ # # phones -- remote host phone number data base # see tip(1), phones(5) diff --git a/etc/printcap b/etc/printcap index 06791f85fc6..81458541304 100644 --- a/etc/printcap +++ b/etc/printcap @@ -1,4 +1,4 @@ -# @(#)printcap 5.3 (Berkeley) 6/30/90 +# $OpenBSD: printcap,v 1.2 1996/05/26 10:25:26 deraadt Exp $ #lp|local line printer:\ # :lp=/dev/lp:sd=/var/spool/lpd:lf=/var/log/lpd-errs: diff --git a/etc/protocols b/etc/protocols index b0a39a00ba0..0bc3b7466d0 100644 --- a/etc/protocols +++ b/etc/protocols @@ -1,10 +1,9 @@ # # Internet (IP) protocols # -# from: @(#)protocols 5.1 (Berkeley) 4/17/89 -# $Id: protocols,v 1.1 1995/10/18 08:37:57 deraadt Exp $ +# $OpenBSD: protocols,v 1.2 1996/05/26 10:25:26 deraadt Exp $ # -# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992). +# Updated based on RFC 1340, Assigned Numbers (July 1992). # ip 0 IP # internet protocol, pseudo protocol number icmp 1 ICMP # internet control message protocol @@ -21,7 +20,7 @@ xns-idp 22 XNS-IDP # Xerox NS IDP rdp 27 RDP # "reliable datagram" protocol 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 +idpr-cmtp 39 IDPR-CMTP # IDPR Control Message Transport vmtp 81 VMTP # Versatile Message Transport ospf 89 OSPFIGP # Open Shortest Path First IGP ipip 94 IPIP # Yet Another IP encapsulation diff --git a/etc/rbootd.conf b/etc/rbootd.conf index d8d95a22848..6e77806791e 100644 --- a/etc/rbootd.conf +++ b/etc/rbootd.conf @@ -1,4 +1,4 @@ -# $NetBSD: rbootd.conf,v 1.2 1995/10/21 18:01:33 thorpej Exp $ +# $OpenBSD: rbootd.conf,v 1.3 1996/05/26 10:25:27 deraadt Exp $ # # Configuration file for rbootd server. # @@ -1,5 +1,4 @@ -# $NetBSD: rc,v 1.54 1995/10/08 18:11:43 thorpej Exp $ -# from: @(#)rc 8.2 (Berkeley) 3/17/94 +# $OpenBSD: rc,v 1.11 1996/05/26 10:25:27 deraadt Exp $ # System startup script run by init on autoboot # or after single-user. diff --git a/etc/rc.local b/etc/rc.local index 4f74b5465a0..92ecd0abf0d 100644 --- a/etc/rc.local +++ b/etc/rc.local @@ -1,8 +1,7 @@ # # site-specific startup actions, daemons # -# From: @(#)rc.local 5.4 (Berkeley) 12/14/90 -# $Id: rc.local,v 1.1 1995/10/18 08:37:57 deraadt Exp $ +# $OpenBSD: rc.local,v 1.2 1996/05/26 10:25:28 deraadt Exp $ # if [ ! -f /etc/motd ]; then diff --git a/etc/remote b/etc/remote index 37d3ffd8010..9820f09e8d8 100644 --- a/etc/remote +++ b/etc/remote @@ -1,3 +1,4 @@ +# $OpenBSD: remote,v 1.2 1996/05/26 10:25:28 deraadt Exp $ # @(#)remote 5.2 (Berkeley) 6/30/90 # # remote -- remote host description file @@ -1,5 +1,6 @@ # -# rpc 88/08/01 4.0 RPCSRC; from 1.12 88/02/07 SMI +# $OpenBSD: rpc,v 1.2 1996/05/26 10:25:29 deraadt Exp $ +# from: rpc 88/08/01 4.0 RPCSRC; from 1.12 88/02/07 SMI # portmapper 100000 portmap sunrpc rstatd 100001 rstat rstat_svc rup perfmeter diff --git a/etc/security b/etc/security index 4fbb8bbd0ac..d68f15fcdea 100644 --- a/etc/security +++ b/etc/security @@ -1,9 +1,7 @@ #!/bin/sh - # -# from: @(#)security 8.1 (Berkeley) 6/9/93 -# $Id: security,v 1.2 1995/12/18 16:56:37 deraadt Exp $ +# $OpenBSD: security,v 1.3 1996/05/26 10:25:29 deraadt Exp $ # - PATH=/sbin:/usr/sbin:/bin:/usr/bin umask 077 diff --git a/etc/services b/etc/services index df0bed7e6a2..03711b98c09 100644 --- a/etc/services +++ b/etc/services @@ -1,5 +1,4 @@ -# $OpenBSD: services,v 1.4 1996/04/23 03:18:35 deraadt Exp $ -# $NetBSD: services,v 1.18 1996/03/26 00:07:58 mrg Exp $ +# $OpenBSD: services,v 1.5 1996/05/26 10:25:30 deraadt Exp $ # # Network services, Internet style # @@ -179,7 +178,7 @@ krbupdate 760/tcp kreg # BSD Kerberos registration kpasswd 761/tcp kpwd # BSD Kerberos `passwd' eklogin 2105/tcp # Kerberos encrypted `rlogin' # -# Unofficial but necessary (for NetBSD) services +# Unofficial services # supfilesrv 871/tcp # SUP server supfiledbg 1127/tcp # SUP debugging diff --git a/etc/shells b/etc/shells index df377f13373..b96b188eddd 100644 --- a/etc/shells +++ b/etc/shells @@ -1,3 +1,4 @@ +# $OpenBSD: shells,v 1.2 1996/05/26 10:25:31 deraadt Exp $ # List of acceptable shells for chpass(1). # Ftpd will not allow users to connect who are not using # one of these shells. diff --git a/etc/syslog.conf b/etc/syslog.conf index ce1df975ba8..c423610f25f 100644 --- a/etc/syslog.conf +++ b/etc/syslog.conf @@ -1,3 +1,5 @@ +# $OpenBSD: syslog.conf,v 1.2 1996/05/26 10:25:31 deraadt Exp $ +# *.err;kern.debug;auth.notice;mail.crit /dev/console *.notice;kern.debug;lpr,auth.info;mail.crit /var/log/messages mail.info /var/log/maillog diff --git a/etc/weekly b/etc/weekly index 5878ed1385a..6bb1b290b0b 100644 --- a/etc/weekly +++ b/etc/weekly @@ -1,6 +1,6 @@ #!/bin/sh - # -# @(#)weekly 5.14 (Berkeley) 6/23/91 +# $OpenBSD: weekly,v 1.3 1996/05/26 10:25:32 deraadt Exp $ # PATH=/bin:/sbin:/usr/sbin:/usr/bin:/usr/libexec |