diff options
author | cjc <cjc@FreeBSD.org> | 2002-02-08 13:25:33 +0000 |
---|---|---|
committer | cjc <cjc@FreeBSD.org> | 2002-02-08 13:25:33 +0000 |
commit | 27ee79e565530cd8305ffd5531cf3bf80d5053db (patch) | |
tree | 0d94060bfe0fc2951090b630d3f590714aaf0489 | |
parent | fe2d1dffd326d27189f73fd3c69e407beecc937c (diff) | |
download | FreeBSD-src-27ee79e565530cd8305ffd5531cf3bf80d5053db.zip FreeBSD-src-27ee79e565530cd8305ffd5531cf3bf80d5053db.tar.gz |
peter points out that we probably should not mess with the sysctl(8)
values at all if they are not purposefully set. What if the
administrator messed with them in /etc/sysctl.conf? We don't want to
overwrite them.
If 'log_in_vain' is zero, do not force the issue. If it is non-zero,
set it.
-rw-r--r-- | etc/network.subr | 9 | ||||
-rw-r--r-- | etc/rc.d/netoptions | 9 | ||||
-rw-r--r-- | etc/rc.d/network1 | 9 | ||||
-rw-r--r-- | etc/rc.d/network2 | 9 | ||||
-rw-r--r-- | etc/rc.d/network3 | 9 | ||||
-rw-r--r-- | etc/rc.d/routing | 9 | ||||
-rw-r--r-- | etc/rc.network | 9 |
7 files changed, 35 insertions, 28 deletions
diff --git a/etc/network.subr b/etc/network.subr index 730c096..a3ec576 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -874,10 +874,11 @@ network_pass4() { ;; esac - [ "${log_in_vain}" -ne 0 ] && echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - + [ "${log_in_vain}" -ne 0 ] && ( + echo -n " log_in_vain=${log_in_vain}" + sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null + sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null + ) echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 730c096..a3ec576 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -874,10 +874,11 @@ network_pass4() { ;; esac - [ "${log_in_vain}" -ne 0 ] && echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - + [ "${log_in_vain}" -ne 0 ] && ( + echo -n " log_in_vain=${log_in_vain}" + sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null + sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null + ) echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 730c096..a3ec576 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -874,10 +874,11 @@ network_pass4() { ;; esac - [ "${log_in_vain}" -ne 0 ] && echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - + [ "${log_in_vain}" -ne 0 ] && ( + echo -n " log_in_vain=${log_in_vain}" + sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null + sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null + ) echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 730c096..a3ec576 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -874,10 +874,11 @@ network_pass4() { ;; esac - [ "${log_in_vain}" -ne 0 ] && echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - + [ "${log_in_vain}" -ne 0 ] && ( + echo -n " log_in_vain=${log_in_vain}" + sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null + sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null + ) echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 730c096..a3ec576 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -874,10 +874,11 @@ network_pass4() { ;; esac - [ "${log_in_vain}" -ne 0 ] && echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - + [ "${log_in_vain}" -ne 0 ] && ( + echo -n " log_in_vain=${log_in_vain}" + sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null + sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null + ) echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 730c096..a3ec576 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -874,10 +874,11 @@ network_pass4() { ;; esac - [ "${log_in_vain}" -ne 0 ] && echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - + [ "${log_in_vain}" -ne 0 ] && ( + echo -n " log_in_vain=${log_in_vain}" + sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null + sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null + ) echo '.' network_pass4_done=YES } diff --git a/etc/rc.network b/etc/rc.network index 730c096..a3ec576 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -874,10 +874,11 @@ network_pass4() { ;; esac - [ "${log_in_vain}" -ne 0 ] && echo -n " log_in_vain=${log_in_vain}" - sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null - sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null - + [ "${log_in_vain}" -ne 0 ] && ( + echo -n " log_in_vain=${log_in_vain}" + sysctl net.inet.tcp.log_in_vain="${log_in_vain}" >/dev/null + sysctl net.inet.udp.log_in_vain="${log_in_vain}" >/dev/null + ) echo '.' network_pass4_done=YES } |