Merge r4203

diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 09d18350741d431cd1d160fd2c909ead52259c46..6be1761ca947a4197c6c65a5fa106e817ba1bca2 100644 (file)
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -128,7 +128,7 @@ adc.enabled  = "yes"
 adc.disabled = "no"
 adc.optional = true
 
-
+--[[
 ipc = m:section(TypedSection, "IpcConnect")
 ipc.anonymous = true
 
@@ -140,6 +140,6 @@ nets.optional = true
 
 hosts = ipc:option(Value, "Host")
 hosts.optional = true
-
+]]
 
 return m

diff --git a/contrib/package/olsrd-luci/files/etc/config/olsrd b/contrib/package/olsrd-luci/files/etc/config/olsrd
index 49e1b2650a8e2ebff8bd84f6821b1ebc73ba6fce..415859022a694fff23056a9fe8a52aa8ad78ef44 100644 (file)
--- a/contrib/package/olsrd-luci/files/etc/config/olsrd
+++ b/contrib/package/olsrd-luci/files/etc/config/olsrd
@@ -20,6 +20,3 @@ config 'LoadPlugin'
 config 'LoadPlugin'
        option 'library' 'olsrd_txtinfo.so.0.1'
        option 'accept' '127.0.0.1'
-
-config 'IpcConnect'
-    option 'MaxConnections' '0'