diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-01 09:56:10 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-10-01 09:56:10 -0300 |
| commit | 788c1288bae791ac0b3f2a19eb8c6aac8d7a7c22 (patch) | |
| tree | 2203239bcbed0d9409ea9c5c179180c7667964a3 /etc/inc/auth.inc | |
| parent | 43652f2fecfeb7ed4de28d697d515197ff1e3100 (diff) | |
| parent | 80a5b5f7e61dc8ed1a7928149506650956b8bb86 (diff) | |
| download | pfsense-788c1288bae791ac0b3f2a19eb8c6aac8d7a7c22.zip pfsense-788c1288bae791ac0b3f2a19eb8c6aac8d7a7c22.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/filter.inc
etc/inc/system.inc
Diffstat (limited to 'etc/inc/auth.inc')
| -rw-r--r-- | etc/inc/auth.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc index cfa9466..59e9128 100644 --- a/etc/inc/auth.inc +++ b/etc/inc/auth.inc @@ -454,6 +454,8 @@ function local_user_set_groups($user, $new_groups = NULL ) { foreach ($cur_groups as $groupname) { if (in_array($groupname,$new_groups)) continue; + if (!isset($config['system']['group'][$groupindex[$groupname]])) + continue; $group = & $config['system']['group'][$groupindex[$groupname]]; if (is_array($group['member'])) { $index = array_search($user['uid'], $group['member']); |
