diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-18 09:10:36 +0100 |
| commit | 1f74cd2d101f032472a4968a10b64161652d6c1f (patch) | |
| tree | d692513243aaed6003264f0b877b50cbeb69328b /usr/local/www/status_captiveportal.php | |
| parent | c9d174dfc0a29c59ae35f43a470460f36f695b61 (diff) | |
| parent | 96e889fc1e938187dd18238d80e3163e1aca3006 (diff) | |
| download | pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.zip pfsense-1f74cd2d101f032472a4968a10b64161652d6c1f.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/interfaces.inc
etc/inc/system.inc
Diffstat (limited to 'usr/local/www/status_captiveportal.php')
| -rwxr-xr-x | usr/local/www/status_captiveportal.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php index 3625e40..9560041 100755 --- a/usr/local/www/status_captiveportal.php +++ b/usr/local/www/status_captiveportal.php @@ -71,7 +71,7 @@ function clientcmp($a, $b) { $cpdb = array(); if (file_exists("{$g['vardb_path']}/captiveportal.db")) { - $captiveportallck = lock('captiveportal'); + $captiveportallck = lock('captiveportaldb'); $cpcontents = file("/var/db/captiveportal.db", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); unlock($captiveportallck); } else |
