summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal LUÇI <eri@pfsense.org>2015-06-19 17:33:19 +0200
committerErmal LUÇI <eri@pfsense.org>2015-06-19 17:33:19 +0200
commitfabb4b0321514813bbb0307671c8605c7c1b36e0 (patch)
treebd877a5ce3ad66e681bb62ea8a617efcb1d1d54a /etc
parent7dc35024af3af1d644c25b002ca9f40f1d61c05b (diff)
downloadpfsense-fabb4b0321514813bbb0307671c8605c7c1b36e0.zip
pfsense-fabb4b0321514813bbb0307671c8605c7c1b36e0.tar.gz
Ticket #4746 Correctly set global variables to be used by hostnames cod epaths
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/captiveportal.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 87a4a74..5ed4b3f 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -1117,7 +1117,7 @@ function captiveportal_allowedip_configure_entry($ipent, $ishostname = false) {
}
function captiveportal_allowedhostname_configure() {
- global $config, $g, $cpzone;
+ global $config, $g, $cpzone, $cpzoneid;
$rules = "";
if (is_array($config['captiveportal'][$cpzone]['allowedhostname'])) {
@@ -1134,7 +1134,7 @@ function captiveportal_allowedhostname_configure() {
if (isvalidpid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid"))
sigkillbypid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid", "HUP");
else
- mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid -i 300 -c {$cp_filterdns_filename} -y {$cpzone} -d 1");
+ mwexec("/usr/local/sbin/filterdns -p {$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid -i 300 -c {$cp_filterdns_filename} -y {$cpzoneid} -d 1");
} else {
killbypid("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid");
@unlink("{$g['varrun_path']}/filterdns-{$cpzone}-cpah.pid");
OpenPOWER on IntegriCloud