diff options
author | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 09:08:10 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2015-04-27 09:08:10 -0300 |
commit | 437799b870f0490f7031ecd3d8a9c85e5227634a (patch) | |
tree | 4cc582e1e3d16f5c56e8453f2bc90f3a02521c3c /etc | |
parent | 03a1d3f65df3b0caad7051f4efe4896849a53a6e (diff) | |
parent | fe65bb3a4b183024989c001053c652f471317af1 (diff) | |
download | pfsense-437799b870f0490f7031ecd3d8a9c85e5227634a.zip pfsense-437799b870f0490f7031ecd3d8a9c85e5227634a.tar.gz |
Merge pull request #1628 from phil-davis/patch-2
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/priv.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/inc/priv.inc b/etc/inc/priv.inc index ee6e876..a15254d 100644 --- a/etc/inc/priv.inc +++ b/etc/inc/priv.inc @@ -292,13 +292,14 @@ function getAllowedPages($username) { // obtain ldap groups if we are in ldap mode if ($authcfg['type'] == "ldap") { $allowed_groups = @ldap_get_groups($username, $authcfg); - } else { + } + if (!$allowed_groups) { // search for a local user by name $local_user = getUserEntry($username); - getPrivPages($local_user, $allowed_pages); - // obtain local groups if we have a local user + // obtain local user pages and groups if we have a local user if ($local_user) { + getPrivPages($local_user, $allowed_pages); $allowed_groups = local_user_get_groups($local_user); } } @@ -331,4 +332,4 @@ function sort_user_privs($privs) { return array_merge($fprivs, $sprivs); } -?>
\ No newline at end of file +?> |