diff options
author | Crist J. Clark <cjc@FreeBSD.org> | 2002-01-26 09:05:13 +0000 |
---|---|---|
committer | Crist J. Clark <cjc@FreeBSD.org> | 2002-01-26 09:05:13 +0000 |
commit | f44609fe71741b4c10ce58af72c2a8996313582f (patch) | |
tree | 9288c28ff8cb9398b240a94b35479631bae7f781 /etc/rc.d | |
parent | 2fca6171861ba323b67b6ac6d393901c0bc84205 (diff) | |
download | src-f44609fe71741b4c10ce58af72c2a8996313582f.tar.gz src-f44609fe71741b4c10ce58af72c2a8996313582f.zip |
Make the rc.conf(5) 'log_in_vain' knob an integer.
Try this out in -CURRENT, MFC, and then consider dropping the
'log_in_vain' knob all together. It really is something for
sysctl.conf(5).
PR: bin/32953
Reviewed by: -bugs discussion
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=89808
Diffstat (limited to 'etc/rc.d')
-rw-r--r-- | etc/rc.d/netoptions | 15 | ||||
-rw-r--r-- | etc/rc.d/network1 | 15 | ||||
-rw-r--r-- | etc/rc.d/network2 | 15 | ||||
-rw-r--r-- | etc/rc.d/network3 | 15 | ||||
-rw-r--r-- | etc/rc.d/routing | 15 |
5 files changed, 60 insertions, 15 deletions
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index d6da093ef634..c75d57de8a30 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -846,14 +846,23 @@ network_pass4() { echo -n 'Additional TCP options:' case ${log_in_vain} in [Nn][Oo] | '') + log_in_vain=0 + ;; + [Yy][Ee][Ss]) + log_in_vain=1 + ;; + [0-9]*) ;; *) - echo -n ' log_in_vain=YES' - sysctl net.inet.tcp.log_in_vain=1 >/dev/null - sysctl net.inet.udp.log_in_vain=1 >/dev/null + echo " invalid log_in_vain setting: ${log_in_vain}" + log_in_vain=0 ;; 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 + echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index d6da093ef634..c75d57de8a30 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -846,14 +846,23 @@ network_pass4() { echo -n 'Additional TCP options:' case ${log_in_vain} in [Nn][Oo] | '') + log_in_vain=0 + ;; + [Yy][Ee][Ss]) + log_in_vain=1 + ;; + [0-9]*) ;; *) - echo -n ' log_in_vain=YES' - sysctl net.inet.tcp.log_in_vain=1 >/dev/null - sysctl net.inet.udp.log_in_vain=1 >/dev/null + echo " invalid log_in_vain setting: ${log_in_vain}" + log_in_vain=0 ;; 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 + echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index d6da093ef634..c75d57de8a30 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -846,14 +846,23 @@ network_pass4() { echo -n 'Additional TCP options:' case ${log_in_vain} in [Nn][Oo] | '') + log_in_vain=0 + ;; + [Yy][Ee][Ss]) + log_in_vain=1 + ;; + [0-9]*) ;; *) - echo -n ' log_in_vain=YES' - sysctl net.inet.tcp.log_in_vain=1 >/dev/null - sysctl net.inet.udp.log_in_vain=1 >/dev/null + echo " invalid log_in_vain setting: ${log_in_vain}" + log_in_vain=0 ;; 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 + echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index d6da093ef634..c75d57de8a30 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -846,14 +846,23 @@ network_pass4() { echo -n 'Additional TCP options:' case ${log_in_vain} in [Nn][Oo] | '') + log_in_vain=0 + ;; + [Yy][Ee][Ss]) + log_in_vain=1 + ;; + [0-9]*) ;; *) - echo -n ' log_in_vain=YES' - sysctl net.inet.tcp.log_in_vain=1 >/dev/null - sysctl net.inet.udp.log_in_vain=1 >/dev/null + echo " invalid log_in_vain setting: ${log_in_vain}" + log_in_vain=0 ;; 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 + echo '.' network_pass4_done=YES } diff --git a/etc/rc.d/routing b/etc/rc.d/routing index d6da093ef634..c75d57de8a30 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -846,14 +846,23 @@ network_pass4() { echo -n 'Additional TCP options:' case ${log_in_vain} in [Nn][Oo] | '') + log_in_vain=0 + ;; + [Yy][Ee][Ss]) + log_in_vain=1 + ;; + [0-9]*) ;; *) - echo -n ' log_in_vain=YES' - sysctl net.inet.tcp.log_in_vain=1 >/dev/null - sysctl net.inet.udp.log_in_vain=1 >/dev/null + echo " invalid log_in_vain setting: ${log_in_vain}" + log_in_vain=0 ;; 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 + echo '.' network_pass4_done=YES } |