control portmap, inetd, and lpd from netstart; idea from tqbf@enteract.com

diff --git a/etc/netstart b/etc/netstart
index d8c939f..2dabaa0 100644 (file)
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $OpenBSD: netstart,v 1.9 1996/08/27 11:46:20 deraadt Exp $
+#      $OpenBSD: netstart,v 1.10 1996/09/04 10:25:55 deraadt Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 routed_flags=-q
@@ -20,6 +20,9 @@ gated=NO
 kerberos_server=NO
 amd=NO
 ipfilter=NO
+portmap=YES                    # almost always needed
+inetd=YES                      # almost always needed
+lpd=NO                         # printing daemons
 
 # miscellaneous other flags
 # only used if the appropriate server is marked YES above

diff --git a/etc/rc b/etc/rc
index 36895e5..3c7da6b 100644 (file)
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-#      $OpenBSD: rc,v 1.22 1996/07/27 01:39:04 deraadt Exp $
+#      $OpenBSD: rc,v 1.23 1996/09/04 10:25:53 deraadt Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -87,7 +87,9 @@ rm -f /var/spool/uucp/STST/*
 (cd /var/run && { rm -rf -- *; install -c -m 664 -g utmp /dev/null utmp; })
 
 echo -n 'starting rpc daemons:'
-echo -n ' portmap';            portmap
+if [ X"${portmap}" == X"YES" ]; then
+       echo -n ' portmap';             portmap
+fi
 
 if [ -d /var/yp/binding ]; then
        if [ -d /var/yp/`domainname` ]; then
@@ -230,7 +232,10 @@ if [ X${rwhod} = X"YES" ]; then
        echo -n ' rwhod';               rwhod
 fi
 
-echo -n ' printer';            lpd
+
+if [ X${lpd} = X"YES" ]; then
+       echo -n ' printer';             lpd
+fi
 
 # $sendmail_flags is imported from /etc/netstart;
 # If $sendmail_flags == NO or /etc/sendmail.cf doesn't exist, then
@@ -240,7 +245,9 @@ if [ "X${sendmail_flags}" != X"NO" -a -r /etc/sendmail.cf ]; then
        echo -n ' sendmail';            /usr/sbin/sendmail ${sendmail_flags}
 fi
 
-echo -n ' inetd';              inetd
+if [ X${inetd} = X"YES" ]; then
+       echo -n ' inetd';               inetd
+fi
 
 # $rarpd_flags is imported from /etc/netstart;
 # If $rarpd_flags == NO or /etc/ethers doesn't exist, then