[patchteam] fix issues with pptpd server and firewall, closes #2342

[openwrt-10.03/.git] / package / ppp / files / etc / ppp / ip-up

diff --git a/package/ppp/files/etc/ppp/ip-up b/package/ppp/files/etc/ppp/ip-up
index fded600dff60fc2800f196ad518bfdfe3f966a1a..376c87e5692b30aa67a28c891dbc146507629596 100755 (executable)
--- a/package/ppp/files/etc/ppp/ip-up
+++ b/package/ppp/files/etc/ppp/ip-up
@@ -5,7 +5,7 @@ PPP_TTY="$2"
 PPP_SPEED="$3"
 PPP_LOCAL="$4"
 PPP_REMOTE="$5"
-PPP_IPPARAM="$6"
+PPP_IPPARAM="$(echo $6 | sed 's/\./_/g')"
 PPP_UNIT="${PPP_IFACE##ppp}"
 
 export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
@@ -13,12 +13,15 @@ export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
        uci_set_state network "$PPP_IPPARAM" unit "$PPP_UNIT"
        uci_set_state network "$PPP_IPPARAM" ipaddr "$PPP_LOCAL"
        uci_set_state network "$PPP_IPPARAM" gateway "$PPP_REMOTE"
+
+       local dns="$DNS1${DNS2:+ $DNS2}"
+       [ -n "$dns" ] && uci_set_state network "$PPP_IPPARAM" dns "$dns"
 }
 [ -z "$PPP_IPPARAM" ] || env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface"
 
 [ -d /etc/ppp/ip-up.d ] && {
        for SCRIPT in /etc/ppp/ip-up.d/*
        do
-               [ -x "$SCRIPT" ] && "$SCRIPT" $@
+               [ -x "$SCRIPT" ] && "$SCRIPT" "$@"
        done
 }