aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2017-03-06 13:47:50 +0100
committerJo-Philipp Wich <jo@mein.io>2017-03-07 11:26:39 +0100
commit64de1cb1fd5a3363d51275735613fe24af7a4964 (patch)
treeb3e99fd27131c9ef46948f629ec68b419968f55d /package/network/services/ppp
parenta8e08164909684c3012b9d6eb7b3656ba650dbb3 (diff)
downloadupstream-64de1cb1fd5a3363d51275735613fe24af7a4964.tar.gz
upstream-64de1cb1fd5a3363d51275735613fe24af7a4964.tar.bz2
upstream-64de1cb1fd5a3363d51275735613fe24af7a4964.zip
ppp: propagate master peerdns setting to dynamic slave interface
Honour the parent interfaces peerdns option when spawning a virtual DHCPv6 interface in order to avoid pulling in IPv6 DNS servers when the user opted to inhibit peer DNS servers in the configuration. Fixes #597. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/services/ppp')
-rw-r--r--package/network/services/ppp/Makefile2
-rwxr-xr-xpackage/network/services/ppp/files/lib/netifd/ppp6-up1
-rwxr-xr-xpackage/network/services/ppp/files/ppp.sh3
3 files changed, 4 insertions, 2 deletions
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 2b04afddc4..8b0daf2295 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp
PKG_VERSION:=2.4.7
-PKG_RELEASE:=10
+PKG_RELEASE:=11
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/
diff --git a/package/network/services/ppp/files/lib/netifd/ppp6-up b/package/network/services/ppp/files/lib/netifd/ppp6-up
index 07b6a43ca5..8ad03223e5 100755
--- a/package/network/services/ppp/files/lib/netifd/ppp6-up
+++ b/package/network/services/ppp/files/lib/netifd/ppp6-up
@@ -23,6 +23,7 @@ if [ -n "$AUTOIPV6" ]; then
json_add_string proto "dhcpv6"
[ -n "$EXTENDPREFIX" ] && json_add_string extendprefix 1
[ -n "$IP6TABLE" ] && json_add_string ip6table $IP6TABLE
+ [ -n "$PEERDNS" ] && json_add_boolean peerdns $PEERDNS
json_close_object
ubus call network add_dynamic "$(json_dump)"
fi
diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index 9c27b3c280..73bc3161cd 100755
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -88,7 +88,7 @@ ppp_generic_setup() {
local config="$1"; shift
local localip
- json_get_vars ipv6 ip6table demand keepalive keepalive_adaptive username password pppd_options pppname unnumbered persist maxfail holdoff
+ json_get_vars ipv6 ip6table demand keepalive keepalive_adaptive username password pppd_options pppname unnumbered persist maxfail holdoff peerdns
if [ "$ipv6" = 0 ]; then
ipv6=""
elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
@@ -137,6 +137,7 @@ ppp_generic_setup() {
${ipv6:++ipv6} \
${autoipv6:+set AUTOIPV6=1} \
${ip6table:+set IP6TABLE=$ip6table} \
+ ${peerdns:+set PEERDNS=$peerdns} \
nodefaultroute \
usepeerdns \
$demand $persist maxfail $maxfail \