diff options
| author | cjc <cjc@FreeBSD.org> | 2001-12-06 09:34:44 +0000 |
|---|---|---|
| committer | cjc <cjc@FreeBSD.org> | 2001-12-06 09:34:44 +0000 |
| commit | a57107b602de1622f3e11d2b7156e33eff49b52c (patch) | |
| tree | d580735bf3a61115fabdac6648b02a7629ca66b8 | |
| parent | 8eeb37dd0eb33d0718825a66277949d509c1eaef (diff) | |
| download | FreeBSD-src-a57107b602de1622f3e11d2b7156e33eff49b52c.zip FreeBSD-src-a57107b602de1622f3e11d2b7156e33eff49b52c.tar.gz | |
Protect the '*' in pppoed_provider (the default) from metacharacter
expansion in the rc-scripts.
PR: 32552
Submitted by: Gleb Smirnoff <glebius@rinet.ru>
Approved by: ru
Obtained from: ru
MFC after: 1 day
| -rw-r--r-- | etc/network.subr | 2 | ||||
| -rw-r--r-- | etc/rc.d/netoptions | 2 | ||||
| -rw-r--r-- | etc/rc.d/network1 | 2 | ||||
| -rw-r--r-- | etc/rc.d/network2 | 2 | ||||
| -rw-r--r-- | etc/rc.d/network3 | 2 | ||||
| -rw-r--r-- | etc/rc.d/routing | 2 | ||||
| -rw-r--r-- | etc/rc.network | 2 |
7 files changed, 14 insertions, 0 deletions
diff --git a/etc/network.subr b/etc/network.subr index 97ca576..9422640 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -808,7 +808,9 @@ network_pass3() { pppoed_flags="${pppoed_flags} -p ${pppoed_provider}" fi echo -n ' pppoed'; + _opts=$-; set -f /usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface} + set +f; set -${_opts} ;; esac diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 97ca576..9422640 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -808,7 +808,9 @@ network_pass3() { pppoed_flags="${pppoed_flags} -p ${pppoed_provider}" fi echo -n ' pppoed'; + _opts=$-; set -f /usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface} + set +f; set -${_opts} ;; esac diff --git a/etc/rc.d/network1 b/etc/rc.d/network1 index 97ca576..9422640 100644 --- a/etc/rc.d/network1 +++ b/etc/rc.d/network1 @@ -808,7 +808,9 @@ network_pass3() { pppoed_flags="${pppoed_flags} -p ${pppoed_provider}" fi echo -n ' pppoed'; + _opts=$-; set -f /usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface} + set +f; set -${_opts} ;; esac diff --git a/etc/rc.d/network2 b/etc/rc.d/network2 index 97ca576..9422640 100644 --- a/etc/rc.d/network2 +++ b/etc/rc.d/network2 @@ -808,7 +808,9 @@ network_pass3() { pppoed_flags="${pppoed_flags} -p ${pppoed_provider}" fi echo -n ' pppoed'; + _opts=$-; set -f /usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface} + set +f; set -${_opts} ;; esac diff --git a/etc/rc.d/network3 b/etc/rc.d/network3 index 97ca576..9422640 100644 --- a/etc/rc.d/network3 +++ b/etc/rc.d/network3 @@ -808,7 +808,9 @@ network_pass3() { pppoed_flags="${pppoed_flags} -p ${pppoed_provider}" fi echo -n ' pppoed'; + _opts=$-; set -f /usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface} + set +f; set -${_opts} ;; esac diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 97ca576..9422640 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -808,7 +808,9 @@ network_pass3() { pppoed_flags="${pppoed_flags} -p ${pppoed_provider}" fi echo -n ' pppoed'; + _opts=$-; set -f /usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface} + set +f; set -${_opts} ;; esac diff --git a/etc/rc.network b/etc/rc.network index 97ca576..9422640 100644 --- a/etc/rc.network +++ b/etc/rc.network @@ -808,7 +808,9 @@ network_pass3() { pppoed_flags="${pppoed_flags} -p ${pppoed_provider}" fi echo -n ' pppoed'; + _opts=$-; set -f /usr/libexec/pppoed ${pppoed_flags} ${pppoed_interface} + set +f; set -${_opts} ;; esac |
