diff options
| author | Ermal <eri@pfsense.org> | 2013-07-10 15:20:31 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2013-07-10 15:20:31 +0000 |
| commit | 0f50d70d30bdb969a0f8db7a2de752d37ec7aad2 (patch) | |
| tree | e222747a78eb91fdea0a02ba34d4be8b232c1b79 | |
| parent | 4624f50fce5f1f41306d6852ca2922079b9d1694 (diff) | |
| download | pfsense-0f50d70d30bdb969a0f8db7a2de752d37ec7aad2.zip pfsense-0f50d70d30bdb969a0f8db7a2de752d37ec7aad2.tar.gz | |
Use empty to cover all needed cases as suggested on #3062. Suggested from pull request #698
| -rw-r--r-- | etc/inc/captiveportal.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 03e14d3..59a6eb4 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -362,6 +362,7 @@ EOD; /* remove old information */ unlink_if_exists("{$g['vardb_path']}/captiveportal{$cpzone}.db"); unlink_if_exists("{$g['vardb_path']}/captiveportal_radius_{$cpzone}.db"); + unlink_if_exists("{$g['vardb_path']}/captiveportal_{$cpzone}.rules"); mwexec("/usr/local/sbin/ipfw_context -d {$cpzone}", true); @@ -1200,7 +1201,7 @@ function radius($username,$password,$clientip,$clientmac,$type, $radiusctx = nul $pipeno = captiveportal_get_next_dn_ruleno(); /* If the pool is empty, return appropriate message and fail authentication */ - if (is_null($pipeno)) { + if (empty($pipeno)) { $auth_list = array(); $auth_list['auth_val'] = 1; $auth_list['error'] = "System reached maximum login capacity"; |
