summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-12-21 03:33:44 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-12-21 03:33:44 +0000
commit1807333983dd16512206d31fa67fd1924f36e56a (patch)
tree6631b65e3e3542cd77287a3850f215bbaee4f761
parent98d0edea3add1f9541f4522c0908af2bbb7fab0f (diff)
isakmpd startup stuff
-rw-r--r--etc/rc9
-rw-r--r--etc/rc.conf3
2 files changed, 10 insertions, 2 deletions
diff --git a/etc/rc b/etc/rc
index fd5ffa74c04..4195b3d7713 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.93 1998/11/11 09:22:49 downsj Exp $
+# $OpenBSD: rc,v 1.94 1998/12/21 03:33:43 deraadt Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -143,6 +143,13 @@ if [ "X${photurisd_flags}" != X"NO" -a -e /etc/photuris/photuris.conf ]; then
echo 'starting photurisd'; photurisd ${photurisd_flags}
fi
+# $isakmpd_flags is imported from /etc/rc.conf;
+# If $isakmpd_flags == NO or /etc/isakmpd.conf doesn't exist, then
+# isakmpd isn't run.
+if [ "X${isakmpd_flags}" != X"NO" -a -e /etc/isakmpd.conf ]; then
+ echo 'starting isakmpd'; isakmpd ${isakmpd_flags}
+fi
+
echo -n 'starting rpc daemons:'
# $portmap is imported from /etc/rc.conf;
diff --git a/etc/rc.conf b/etc/rc.conf
index cbcecfbcdcf..a3698bd7c87 100644
--- a/etc/rc.conf
+++ b/etc/rc.conf
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: rc.conf,v 1.33 1998/11/11 09:22:49 downsj Exp $
+# $OpenBSD: rc.conf,v 1.34 1998/12/21 03:33:43 deraadt Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
routed_flags=NO # for 'normal' use: routed_flags="-q"
@@ -13,6 +13,7 @@ smtpfwdd_flags=NO # for 'normal' use: smtpfwdd_flags="", no -bd above.
named_flags=NO # for 'normal' use: named_flags=""
timed_flags=NO # for 'normal' use: timed_flags=""
photurisd_flags=NO # for 'normal' use: photurisd_flags=""
+isakmpd_flags=NO # for 'normal' use: isakmpd_flags=""
mopd_flags=NO # for 'normal' use: mopd_flags="-a"
httpd_flags=NO # for 'normal' use: httpd_flags=""
apmd_flags=NO # for 'normal' use: apmd_flags=""