diff options
| author | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
|---|---|---|
| committer | lupo49 <post@lupo49.de> | 2011-11-12 16:22:44 +0100 |
| commit | fe9851b94f1bfe4014cf48043b4609def611a3ee (patch) | |
| tree | 2362c48e0526f2254bb80a70db107b3032736a80 /inc/auth | |
| parent | 1614eb9180008daaf518e6271b82222219efc008 (diff) | |
| parent | 2c961e6163b23ef3f1d93b1b0c23b214f3aeb358 (diff) | |
| download | rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.gz rpg-fe9851b94f1bfe4014cf48043b4609def611a3ee.tar.bz2 | |
Merge remote branch 'upstream/master'
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; |