summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-06-15 12:15:31 -0400
committerjim-p <jimp@pfsense.org>2011-06-15 12:15:31 -0400
commitd56f17d1ccf9d0150c9c178be60620b64b0ffa1a (patch)
tree476f4b0a8601a74122f82e7d36ae33d7fffbbe26 /etc/inc
parente49d4564dbf6be680e4d3c91c00a798e390fa358 (diff)
parentf45075dd98eefbad6d02794a335204c5dc8d7c74 (diff)
downloadpfsense-d56f17d1ccf9d0150c9c178be60620b64b0ffa1a.zip
pfsense-d56f17d1ccf9d0150c9c178be60620b64b0ffa1a.tar.gz
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/captiveportal.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index b0cbf14..cd419ff 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -697,7 +697,7 @@ function captiveportal_prune_old() {
}
/* if vouchers are configured, activate session timeouts */
- if (!$timedout && isset($config['voucher']['enable'])) {
+ if (!$timedout && isset($config['voucher']['enable']) && !empty($cpentry[7])) {
if ($pruning_time >= ($cpentry[0] + $cpentry[7])) {
$timedout = true;
$term_cause = 5; // Session-Timeout
OpenPOWER on IntegriCloud