From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 1 May 2010 17:55:41 +0000 (+0000)
Subject: [package] pptp:
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=19172c5d00633baa3fe010c42dd63b39105faca4

[package] pptp:
	- bring pptp scripts in sync with updated ppp logic
	- bump package revision


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21284 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 76e0f6e644..fd8f443564 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptp
 PKG_VERSION:=1.6.0
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/pptpclient
diff --git a/package/pptp/files/pptp.sh b/package/pptp/files/pptp.sh
index e38c24200d..ed5f46fff3 100644
--- a/package/pptp/files/pptp.sh
+++ b/package/pptp/files/pptp.sh
@@ -1,11 +1,10 @@
-scan_pptp() {
-	scan_ppp "$@"
-}
-
 find_gw() {
 	route -n | awk '$1 == "0.0.0.0" { print $2; exit }'
 }
 
+stop_interface_pptp() {
+	stop_interface_ppp "$1"
+}
 
 setup_interface_pptp() {
 	local config="$2"
@@ -31,11 +30,6 @@ setup_interface_pptp() {
 	config_get netmask "$config" netmask
 	[ -z "$netmask" -o -z "$device" ] || ifconfig $device netmask $netmask
 
-	# make sure the network state references the correct ifname
-	scan_ppp "$config"
-	config_get ifname "$config" ifname
-	uci_set_state network "$config" ifname "$ifname"
-
 	config_get mtu "$config" mtu
 	mtu=${mtu:-1452}
 	start_pppd "$config" \