diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-13 09:57:07 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-13 09:57:07 -0300 |
| commit | f14bd707b017d5c6325048c1ff72f7554f8f60bc (patch) | |
| tree | 9ebc7882f4b21e8106addb1227d10a97d99e9183 /etc/inc/auth.inc | |
| parent | 8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b (diff) | |
| parent | 4b4d550a5a95db9c1cf80930fdbae8f9db91f8b8 (diff) | |
| download | pfsense-f14bd707b017d5c6325048c1ff72f7554f8f60bc.zip pfsense-f14bd707b017d5c6325048c1ff72f7554f8f60bc.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/filter.inc
etc/inc/gwlb.inc
Diffstat (limited to 'etc/inc/auth.inc')
| -rw-r--r-- | etc/inc/auth.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index 1180174..cfa9466 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -94,7 +94,7 @@ function index_groups() { $groupindex = array(); - if (isset($config['system']['group'])) { + if (is_array($config['system']['group'])) { $i = 0; foreach($config['system']['group'] as $groupent) { $groupindex[$groupent['name']] = $i; @@ -108,7 +108,7 @@ function index_groups() { function index_users() { global $g, $debug, $config; - if (isset($config['system']['user'])) { + if (is_array($config['system']['user'])) { $i = 0; foreach($config['system']['user'] as $userent) { $userindex[$userent['name']] = $i; |
