Merge pull request #276 from kdarbyshirebryant/upnpenabled

miniupnpd: implement an 'enabled' flag

diff --git a/miniupnpd/files/miniupnpd.init b/miniupnpd/files/miniupnpd.init
index c7dc6a26289991c91b4fd00d33cdb66b60d58f97..c934a283732b60e357bb75bb13934ae0123a2f6e 100644 (file)
--- a/miniupnpd/files/miniupnpd.init
+++ b/miniupnpd/files/miniupnpd.init
@@ -68,7 +68,11 @@ start() {
        local extip port usesysuptime conffile serial_number model_number
        local uuid notify_interval presentation_url enable_upnp
        local upnp_lease_file clean_ruleset_threshold clean_ruleset_interval
-        local ipv6_listening_ip
+        local ipv6_listening_ip enabled
+
+       config_get_bool enabled config enabled 1
+
+       [ "$enabled" -gt 0 ] || return 1
 
        config_get extiface config external_iface
        config_get extzone config external_zone

diff --git a/miniupnpd/files/upnpd.config b/miniupnpd/files/upnpd.config
index 56cde579e072faec3061c92b6caef27c4e4912cb..9a65bfa6330e6c8ee3ccc13057dc8d5fbad9018d 100644 (file)
--- a/miniupnpd/files/upnpd.config
+++ b/miniupnpd/files/upnpd.config
@@ -1,4 +1,5 @@
 config upnpd config
+       option enabled          0
        option enable_natpmp    1
        option enable_upnp      1
        option secure_mode      1