diff options
| author | bcyrill <cyrill@bannwart.info> | 2013-01-10 18:27:33 +0100 |
|---|---|---|
| committer | bcyrill <cyrill@bannwart.info> | 2013-01-10 18:27:33 +0100 |
| commit | dbce0c2c70e75e04b85aa8cc75cb9de9f8ec46f7 (patch) | |
| tree | 5e2d6337c6e5f1bb46c4a92a2ce97448209da8fb /etc/inc | |
| parent | 84f394c6f135b9f38efa28bd6f072caa75cb13b8 (diff) | |
| download | pfsense-dbce0c2c70e75e04b85aa8cc75cb9de9f8ec46f7.zip pfsense-dbce0c2c70e75e04b85aa8cc75cb9de9f8ec46f7.tar.gz | |
Allow empty RADIUS keys
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index c760d45..966fdea 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1091,9 +1091,9 @@ function captiveportal_init_radius_servers() { $radiusport4 = 1812; $radiuskey = $config['captiveportal'][$cpzone]['radiuskey']; - $radiuskey2 = ($config['captiveportal'][$cpzone]['radiuskey2']) ? $config['captiveportal'][$cpzone]['radiuskey2'] : null; - $radiuskey3 = ($config['captiveportal'][$cpzone]['radiuskey3']) ? $config['captiveportal'][$cpzone]['radiuskey3'] : null; - $radiuskey4 = ($config['captiveportal'][$cpzone]['radiuskey4']) ? $config['captiveportal'][$cpzone]['radiuskey4'] : null; + $radiuskey2 = $config['captiveportal'][$cpzone]['radiuskey2']; + $radiuskey3 = $config['captiveportal'][$cpzone]['radiuskey3']; + $radiuskey4 = $config['captiveportal'][$cpzone]['radiuskey4']; $cprdsrvlck = lock("captiveportalradius{$cpzone}", LOCK_EX); $fd = @fopen("{$g['vardb_path']}/captiveportal_radius_{$cpzone}.db", "w"); @@ -1102,13 +1102,13 @@ function captiveportal_init_radius_servers() { unlock($cprdsrvlck); return 1; } - if (isset($radiusip, $radiuskey)) + if (isset($radiusip)) fwrite($fd,$radiusip . "," . $radiusport . "," . $radiusacctport . "," . $radiuskey . ",first"); - if (isset($radiusip2, $radiuskey2)) + if (isset($radiusip2)) fwrite($fd,"\n" . $radiusip2 . "," . $radiusport2 . "," . $radiusacctport . "," . $radiuskey2 . ",first"); - if (isset($radiusip3, $radiuskey3)) + if (isset($radiusip3)) fwrite($fd,"\n" . $radiusip3 . "," . $radiusport3 . "," . $radiusacctport . "," . $radiuskey3 . ",second"); - if (isset($radiusip4, $radiuskey4)) + if (isset($radiusip4)) fwrite($fd,"\n" . $radiusip4 . "," . $radiusport4 . "," . $radiusacctport . "," . $radiuskey4 . ",second"); |
