diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 10:50:03 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2011-11-27 10:50:03 +0100 |
| commit | 560f6ea3cdac2767863c3be3a9e7933b6e37e88f (patch) | |
| tree | 6f51d4b3402458e4de1a596b93ec752c8ac747b2 /inc/auth | |
| parent | e0dd04a6493f1b7f7133f75c08f9ea55ee8bd50a (diff) | |
| parent | c66c7229a0dfc4f9f06dadda98408679fa7a18d6 (diff) | |
| download | rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.gz rpg-560f6ea3cdac2767863c3be3a9e7933b6e37e88f.tar.bz2 | |
Merge branch 'master' into bcrypt
Diffstat (limited to 'inc/auth')
| -rw-r--r-- | inc/auth/ad.class.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/inc/auth/ad.class.php b/inc/auth/ad.class.php index 9ffd3e18b..1fddad243 100644 --- a/inc/auth/ad.class.php +++ b/inc/auth/ad.class.php @@ -286,11 +286,13 @@ class auth_ad extends auth_basic { if(isset($changes['mail'])){ $adchanges['email'] = $changes['mail']; } - try { - $return = $return & $this->adldap->user_modify($user,$adchanges); - } catch (adLDAPException $e) { - if ($this->cnf['debug']) msg('AD Auth: '.$e->getMessage(), -1); - $return = false; + if(count($adchanges)){ + try { + $return = $return & $this->adldap->user_modify($user,$adchanges); + } catch (adLDAPException $e) { + if ($this->cnf['debug']) msg('AD Auth: '.$e->getMessage(), -1); + $return = false; + } } return $return; |