From 1218780bd16445678345529b5a7e3a1a52a3b402 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 5 May 1997 07:08:31 +0000 Subject: [PATCH] Add inetd_flags and way of passing ipfw a configuration file (if firewall = "somefilename"). Fix typo fixes and URLs which were accidently nuked out of this file (submitted by: soil@quick.net via PR#3501). Submitted by: "Danny J. Zerkel" --- etc/rc | 4 ++-- etc/rc.conf | 3 ++- etc/rc.firewall | 13 +++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/etc/rc b/etc/rc index 6a11028b8dd9..e29aa75d1d6b 100644 --- a/etc/rc +++ b/etc/rc @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: rc,v 1.120 1997/05/04 12:50:33 andreas Exp $ +# $Id: rc,v 1.121 1997/05/04 22:33:17 andreas Exp $ # From: @(#)rc 5.27 (Berkeley) 6/5/91 # System startup script run by init on autoboot @@ -217,7 +217,7 @@ ldconfig ${_LDC} # Now start up miscellaneous daemons that don't belong anywhere else # echo -n starting standard daemons: -echo -n ' inetd'; inetd +echo -n ' inetd'; inetd ${inetd_flags} echo -n ' cron'; cron if [ "X${lpd_enable}" = X"YES" ]; then diff --git a/etc/rc.conf b/etc/rc.conf index 7644a50ea2a3..6e6839d62f47 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -6,7 +6,7 @@ # # All arguments must be in double or single quotes. # -# $Id: rc.conf,v 1.1.2.5 1997/05/01 23:42:19 jkh Exp $ +# $Id: rc.conf,v 1.6 1997/05/03 11:22:17 jkh Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -35,6 +35,7 @@ ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. ### Network daemon (miscellaneous) & NFS options: ### syslogd_enable="YES" # Run syslog daemon (or NO). syslogd_flags="" # Flags to syslogd (if enabled). +inetd_flags="" # Optional flags to inetd (always enabled). named_enable="NO" # Run named, the DNS server (or NO). named_flags="" # Flags to named (if enabled). kerberos_server_enable="NO" # Run a kerberos master server (or NO). diff --git a/etc/rc.firewall b/etc/rc.firewall index abc018359835..b0e29baf309c 100644 --- a/etc/rc.firewall +++ b/etc/rc.firewall @@ -1,6 +1,6 @@ ############ # Setup system for firewall service. -# $Id: rc.firewall,v 1.6.2.1 1997/04/26 22:39:34 jkh Exp $ +# $Id: rc.firewall,v 1.11 1997/05/03 11:22:17 jkh Exp $ ############ # @@ -23,6 +23,7 @@ # # O'Reilly & Associates, Inc # ISBN 1-56592-124-0 +# http://www.ora.com/ # # For a more advanced treatment of Internet Security read: # @@ -32,6 +33,7 @@ # # Addison-Wesley # ISBN 0-201-6337-4 +# http://www.awl.com/ # ############ @@ -92,7 +94,7 @@ elif [ "${firewall}" = "client" ]; then /sbin/ipfw add pass udp from any 123 to ${ip} /sbin/ipfw add pass udp from ${ip} to any 123 - # Everyting else is denied as default. + # Everything else is denied as default. elif [ "${firewall}" = "simple" ]; then @@ -149,6 +151,9 @@ elif [ "${firewall}" = "simple" ]; then /sbin/ipfw add pass udp from any 123 to ${oip} /sbin/ipfw add pass udp from ${oip} to any 123 - # Everyting else is denied as default. -fi + # Everything else is denied as default. +elif [ "${firewall}" != "NONE" -a -r "${firewall}" ]; then + + /sbin/ipfw ${firewall} +fi