From a38c321e693e304aa52fc46d44beace21bfea8ec Mon Sep 17 00:00:00 2001 From: mkasper Date: Tue, 21 Mar 2006 17:59:00 +0000 Subject: [PATCH] Omit 3rd DNS server in mpd.conf (PPTP VPN), if specified (-> jdegraeve). Fix handling of aliases that contain "opt" in firewall_rules_edit.php (suggested by Edward Mzj). git-svn-id: https://svn.m0n0.ch/wall/trunk@106 e36fee2c-cc09-0410-a7cc-ebac5c6737de --- phpconf/inc/vpn.inc | 2 +- webgui/firewall_rules_edit.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpconf/inc/vpn.inc b/phpconf/inc/vpn.inc index 31038bf..4ceac41 100644 --- a/phpconf/inc/vpn.inc +++ b/phpconf/inc/vpn.inc @@ -555,7 +555,7 @@ EOD; $mpdconf .= " " . $syscfg['dnsserver'][0]; $mpdconf .= "\n"; } else if (is_array($syscfg['dnsserver']) && ($syscfg['dnsserver'][0])) { - $mpdconf .= " set ipcp dns " . join(" ", $syscfg['dnsserver']) . "\n"; + $mpdconf .= " set ipcp dns " . join(" ", array_slice($syscfg['dnsserver'], 0, 2)) . "\n"; } if (isset($pptpdcfg['radius']['enable'])) { diff --git a/webgui/firewall_rules_edit.php b/webgui/firewall_rules_edit.php index 78b5618..4339457 100755 --- a/webgui/firewall_rules_edit.php +++ b/webgui/firewall_rules_edit.php @@ -57,7 +57,7 @@ if (isset($_GET['dup'])) { function is_specialnet($net) { global $specialsrcdst; - if (in_array($net, $specialsrcdst) || strstr($net, "opt")) + if (in_array($net, $specialsrcdst) || (strstr($net, "opt") && !is_alias($net))) return true; else return false; -- 2.25.1