net/pptpd: add static remote ip in config file

Add ability to configure a static remote ip in pptp config file
This change has backward compatibility with old config files

Also remove the MAINTAINER as intructed

Signed-off-by: Thiago Pereira Ricciardi <thiago.ricciardi@gmail.com>

diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile
index e9f0d62c807dd2945951c1618da1938c2190e714..083254b834bcf0553650009b1c9b12954fcd8abf 100644 (file)
--- a/net/pptpd/Makefile
+++ b/net/pptpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pptpd
 PKG_VERSION:=1.4.0
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/poptop
@@ -18,8 +18,6 @@ PKG_HASH:=8fcd8b8a42de2af59e9fe8cbaa9f894045c977f4d038bbd6346a8522bb7f06c0
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/pptpd

diff --git a/net/pptpd/files/pptpd.init b/net/pptpd/files/pptpd.init
index dc945c4e8ce848ee057cee92426e414c71d96e54..322eaaf1b5ef3f0db786a1caab4cc1ce41653429 100644 (file)
--- a/net/pptpd/files/pptpd.init
+++ b/net/pptpd/files/pptpd.init
@@ -12,7 +12,8 @@ OPTIONS_PPTP=/var/etc/options.pptpd
 validate_login_section() {
        uci_load_validate pptpd login "$1" "$2" \
                'username:string' \
-               'password:string'
+               'password:string' \
+               'remoteip:string'
 }
 
 validate_pptpd_section() {
@@ -32,8 +33,9 @@ setup_login() {
 
        [ -n "$username" ] || return 0
        [ -n "$password" ] || return 0
+       [ -n "$remoteip" ] || remoteip=*
 
-       echo "$username pptp-server $password *" >> $CHAP_SECRETS
+       echo "$username pptp-server $password $remoteip" >> $CHAP_SECRETS
 }
 
 setup_config() {