diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-08-11 14:04:55 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-15 04:28:26 +0200 |
| commit | 42be8db00c4255de6cccfa8ff1250119d7486730 (patch) | |
| tree | a0b859ad467e7be3affa7b88c0b205cdc693b217 /src | |
| parent | a2a257c1d87dc384b224dd8f024b7dc7661e161c (diff) | |
| download | netctl-42be8db00c4255de6cccfa8ff1250119d7486730.tar.gz netctl-42be8db00c4255de6cccfa8ff1250119d7486730.tar.xz | |
Sanitize quotes for wpa_start
Arguments to wpa_start shouldn't be expanded until wpa_start receives
them: so should be quoted by all calling functions. I added quotes
throughout. In general, it seems wise to quote except when it's
absolutely certain not to be needed---or you specifically _do_ want
to expand arguments. In this case, it's extra important.
Because this might be missed in later code, I also wrangled wpa_start
so that it doesn't rely on WPA_OPTS being all in $3.
One of these fixes would have sufficed, but what the hell I did both.
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/connections/wireless | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/connections/wireless b/src/connections/wireless index 98320fa..d9b457a 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -117,8 +117,13 @@ wireless_up() { # Connect! [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwext" +<<<<<<< Updated upstream report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then +======= + report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF/wpa.conf" "$WPA_OPTS" + if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS"; then +>>>>>>> Stashed changes report_fail "wpa_supplicant did not start, possible configuration error" return 1 fi |