diff options
| -rw-r--r-- | etc/Makefile | 25 | ||||
| -rw-r--r-- | etc/changelist | 10 | ||||
| -rw-r--r-- | etc/examples/exports (renamed from etc/exports) | 2 | ||||
| -rw-r--r-- | etc/examples/ftpchroot (renamed from etc/ftpchroot) | 2 | ||||
| -rw-r--r-- | etc/examples/hosts.lpd (renamed from etc/hosts.lpd) | 2 | ||||
| -rw-r--r-- | etc/examples/printcap (renamed from etc/printcap) | 2 | ||||
| -rw-r--r-- | etc/examples/remote (renamed from etc/remote) | 2 |
7 files changed, 22 insertions, 23 deletions
diff --git a/etc/Makefile b/etc/Makefile index f89f278ba38..5af7660ca70 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.361 2014/07/11 21:30:21 deraadt Exp $ +# $OpenBSD: Makefile,v 1.362 2014/07/12 03:52:39 deraadt Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -31,19 +31,18 @@ kernels: bootblocks ${ALL_KERNELS} BINOWN= root BINGRP= wheel BIN1= changelist csh.cshrc csh.login csh.logout daily \ - exports ftpusers ftpchroot gettytab group hosts hosts.lpd \ - ksh.kshrc locate.rc man.conf monthly motd myname \ - netstart networks newsyslog.conf printcap protocols \ - rc rc.conf rc.local rc.securelevel rc.shutdown \ - remote rpc services shells syslog.conf weekly \ - etc.${MACHINE}/login.conf \ - etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \ - moduli pf.os mixerctl.conf + ftpusers gettytab group hosts ksh.kshrc locate.rc \ + man.conf monthly motd myname netstart networks \ + newsyslog.conf protocols rc rc.conf rc.local \ + rc.securelevel rc.shutdown rpc services shells syslog.conf \ + weekly etc.${MACHINE}/login.conf etc.${MACHINE}/disktab \ + dhclient.conf mailer.conf ntpd.conf moduli pf.os mixerctl.conf -EXAMPLES=bgpd.conf chio.conf dhcpd.conf dvmrpd.conf hostapd.conf \ - ifstated.conf iked.conf inetd.conf ipsec.conf ldapd.conf ldpd.conf \ - mrouted.conf ospf6d.conf ospfd.conf rbootd.conf \ - relayd.conf ripd.conf sasyncd.conf sensorsd.conf snmpd.conf \ +EXAMPLES=bgpd.conf chio.conf dhcpd.conf dvmrpd.conf exports ftpchroot \ + hostapd.conf hosts.lpd ifstated.conf iked.conf \ + inetd.conf ipsec.conf ldapd.conf ldpd.conf mrouted.conf \ + ospf6d.conf ospfd.conf printcap rbootd.conf relayd.conf \ + remote ripd.conf sasyncd.conf sensorsd.conf snmpd.conf \ ypldap.conf .if ${MACHINE} != "aviion" diff --git a/etc/changelist b/etc/changelist index c8f3c39cb61..3debfe05782 100644 --- a/etc/changelist +++ b/etc/changelist @@ -1,4 +1,4 @@ -# $OpenBSD: changelist,v 1.90 2014/07/11 21:20:10 deraadt Exp $ +# $OpenBSD: changelist,v 1.91 2014/07/12 03:52:39 deraadt Exp $ # # List of files which the security script backs up and checks # for modifications. @@ -28,10 +28,10 @@ /etc/distfile +/etc/dvmrpd.conf /etc/ethers -/etc/exports ++/etc/exports /etc/fbtab /etc/fstab -/etc/ftpchroot ++/etc/ftpchroot /etc/ftpusers /etc/ftpwelcome /etc/gettytab @@ -101,7 +101,7 @@ /etc/pf.conf /etc/pf.os /etc/pkg.conf -/etc/printcap ++/etc/printcap /etc/profile /etc/protocols +/etc/pwd.db @@ -114,7 +114,7 @@ /etc/rc.securelevel /etc/rc.shutdown +/etc/relayd.conf -/etc/remote ++/etc/remote /etc/resolv.conf /etc/resolv.conf.tail +/etc/ripd.conf diff --git a/etc/exports b/etc/examples/exports index f98e8fff9e6..bc95df4b2e9 100644 --- a/etc/exports +++ b/etc/examples/exports @@ -1,4 +1,4 @@ -# $OpenBSD: exports,v 1.2 2002/05/31 08:15:44 pjanzen Exp $ +# $OpenBSD: exports,v 1.1 2014/07/12 03:52:39 deraadt Exp $ # # NFS exports Database # See exports(5) for more information. Be very careful: misconfiguration diff --git a/etc/ftpchroot b/etc/examples/ftpchroot index 84953401fd4..fb918794de1 100644 --- a/etc/ftpchroot +++ b/etc/examples/ftpchroot @@ -1,4 +1,4 @@ -# $OpenBSD: ftpchroot,v 1.3 1996/07/18 12:12:47 deraadt Exp $ +# $OpenBSD: ftpchroot,v 1.1 2014/07/12 03:52:39 deraadt Exp $ # # list of users (one per line) given ftp access to a chrooted area. # read by ftpd(8). diff --git a/etc/hosts.lpd b/etc/examples/hosts.lpd index d05d125b448..177726cb0bc 100644 --- a/etc/hosts.lpd +++ b/etc/examples/hosts.lpd @@ -1,2 +1,2 @@ -# $OpenBSD: hosts.lpd,v 1.4 2014/04/20 18:06:37 tedu Exp $ +# $OpenBSD: hosts.lpd,v 1.1 2014/07/12 03:52:39 deraadt Exp $ # As described in lpd(8), place one legal access hostname per line. diff --git a/etc/printcap b/etc/examples/printcap index 27656bfcf81..a63abc4eaca 100644 --- a/etc/printcap +++ b/etc/examples/printcap @@ -1,4 +1,4 @@ -# $OpenBSD: printcap,v 1.4 2003/03/28 21:32:30 jmc Exp $ +# $OpenBSD: printcap,v 1.1 2014/07/12 03:52:39 deraadt Exp $ #lp|local line printer:\ # :lp=/dev/lp:sd=/var/spool/output:lf=/var/log/lpd-errs: diff --git a/etc/remote b/etc/examples/remote index 598866c4df2..2ca464db1fe 100644 --- a/etc/remote +++ b/etc/examples/remote @@ -1,4 +1,4 @@ -# $OpenBSD: remote,v 1.15 2014/03/18 22:36:29 miod Exp $ +# $OpenBSD: remote,v 1.1 2014/07/12 03:52:39 deraadt Exp $ # from: @(#)remote 8.1 (Berkeley) 6/10/93 # # remote -- remote host description database |