From ccc9a8e8764a5c6e8421d6fa0a4765eeb0b7c7e6 Mon Sep 17 00:00:00 2001 From: dougb Date: Sun, 17 Dec 2000 22:14:49 +0000 Subject: * Add an eval so that ipnat_flags=">/dev/null" works, per the PR * Do some line length and specify full path cleanups while I'm here PR: conf/22937 Submitted by: Andre Albsmeier --- etc/network.subr | 8 +++++--- etc/rc.d/netoptions | 8 +++++--- etc/rc.d/network1 | 8 +++++--- etc/rc.d/network2 | 8 +++++--- etc/rc.d/network3 | 8 +++++--- etc/rc.d/routing | 8 +++++--- etc/rc.network | 8 +++++--- 7 files changed, 35 insertions(+), 21 deletions(-) (limited to 'etc') diff --git a/etc/network.subr b/etc/network.subr index 1e67911..ef6c603 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 1e67911..ef6c603 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 1e67911..ef6c603 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 1e67911..ef6c603 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 1e67911..ef6c603 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 1e67911..ef6c603 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi diff --git a/etc/rc.network b/etc/rc.network index 1e67911..ef6c603 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -64,18 +64,20 @@ network_pass1() { [Yy][Ee][Ss]) if [ -r "${ipfilter_rules}" ]; then echo -n ' ipfilter'; - ${ipfilter_program:-ipf -Fa -f} "${ipfilter_rules}" ${ipfilter_flags} + ${ipfilter_program:-/sbin/ipf -Fa -f} \ + "${ipfilter_rules}" ${ipfilter_flags} case "${ipmon_enable}" in [Yy][Ee][Ss]) echo -n ' ipmon' - ${ipmon_program:-ipmon} ${ipmon_flags} + ${ipmon_program:-/sbin/ipmon} ${ipmon_flags} ;; esac case "${ipnat_enable}" in [Yy][Ee][Ss]) if [ -r "${ipnat_rules}" ]; then echo -n ' ipnat'; - ${ipnat_program:-ipnat -CF -f} "${ipnat_rules}" ${ipnat_flags} + eval ${ipnat_program:-/sbin/ipnat -CF -f} \ + "${ipnat_rules}" ${ipnat_flags} else echo -n ' NO IPNAT RULES' fi -- cgit v1.1