summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@cvs.openbsd.org>2011-04-17 21:26:39 +0000
committerIngo Schwarze <schwarze@cvs.openbsd.org>2011-04-17 21:26:39 +0000
commit125dfbe9c88f88be29d709aca49611225671aa34 (patch)
treeda3f69d0634f672e06bcb42a97f31c60a936ba2d /etc
parent9db3fef6889ea4b92dd3ae94e557078cb7fccd22 (diff)
Switch from the old shell script /etc/security
to the new Perl script /usr/libexec/security. The new script was tested by sthen@ and ajacoutot@. Committing now due to repeated prodding from deraadt@. In case problems show up, they will be fixed in tree.
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile4
-rw-r--r--etc/daily6
2 files changed, 5 insertions, 5 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 750b6e649f4..5442399f34b 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.294 2010/10/26 20:56:03 robert Exp $
+# $OpenBSD: Makefile,v 1.295 2011/04/17 21:26:38 schwarze Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@@ -18,7 +18,7 @@ BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
ksh.kshrc locate.rc man.conf monthly motd mrouted.conf myname \
netstart networks newsyslog.conf printcap protocols \
rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
- remote rpc security services shells syslog.conf weekly \
+ remote rpc services shells syslog.conf weekly \
etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
moduli pf.os sensorsd.conf ifstated.conf
diff --git a/etc/daily b/etc/daily
index e0283fe54f9..941d1f0dfff 100644
--- a/etc/daily
+++ b/etc/daily
@@ -1,5 +1,5 @@
#
-# $OpenBSD: daily,v 1.69 2011/04/15 11:23:39 halex Exp $
+# $OpenBSD: daily,v 1.70 2011/04/17 21:26:38 schwarze Exp $
# From: @(#)daily 8.2 (Berkeley) 1/25/94
#
# For local additions, create the file /etc/daily.local.
@@ -192,8 +192,8 @@ end_part
MAINOUT=/var/log/security.out
install -o 0 -g 0 -m 600 -b /dev/null $MAINOUT
-start_part "Running /etc/security:"
-run_script "security"
+start_part "Running security(8):"
+/usr/libexec/security
end_part
rm -f $PARTOUT