From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 31 Jan 2009 03:02:57 +0000 (+0000)
Subject: Merge r4203
X-Git-Tag: 0.8.5~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e50137c73cdb680697bcec37ed1e69a0e350d667;p=oweals%2Fluci.git

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 09d183507..6be1761ca 100644
--- 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 49e1b2650..415859022 100644
--- 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'