aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-11-14 15:10:10 +0100
committerdoktornotor <notordoktor@gmail.com>2015-11-14 15:10:10 +0100
commit74d4ad537cb20f53a76c19ce63e49220e2af24c9 (patch)
tree6e9d0a1b642587de2b3f56eb87f399178a27cf06
parentc5958af1440aaf992e9998336e13dc2829c63900 (diff)
downloadpfsense-packages-74d4ad537cb20f53a76c19ce63e49220e2af24c9.tar.gz
pfsense-packages-74d4ad537cb20f53a76c19ce63e49220e2af24c9.tar.bz2
pfsense-packages-74d4ad537cb20f53a76c19ce63e49220e2af24c9.zip
Fix the merge ifaces logic for renamed option
-rw-r--r--config/ntop2/ntop.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/ntop2/ntop.inc b/config/ntop2/ntop.inc
index 7c846b87..da017eac 100644
--- a/config/ntop2/ntop.inc
+++ b/config/ntop2/ntop.inc
@@ -87,7 +87,7 @@ function sync_package_ntop() {
/* Set up ntop interfaces */
$ifaces_final = "";
$first = 0;
- $mergeifs = ($ntop_config['disallowmerge'] == "on") ? "" : "-M";
+ $mergeifs = $ntop_config['disallowmerge'] == "on" ? "-M" : "";
foreach ($ntop_config['interface_array'] as $iface) {
$if = convert_friendly_interface_to_real_interface_name($iface);