From 33ddd51969aa270bd12b69b2c9a6f6457396d8a2 Mon Sep 17 00:00:00 2001 From: Thiago Pereira Ricciardi Date: Wed, 3 Apr 2019 23:26:15 +0000 Subject: [PATCH] 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 --- net/pptpd/Makefile | 4 +--- net/pptpd/files/pptpd.init | 6 ++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/pptpd/Makefile b/net/pptpd/Makefile index e9f0d62c80..083254b834 100644 --- 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 - include $(INCLUDE_DIR)/package.mk define Package/pptpd diff --git a/net/pptpd/files/pptpd.init b/net/pptpd/files/pptpd.init index dc945c4e8c..322eaaf1b5 100644 --- 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() { -- 2.30.2