correctly catch password policy problems in adLDAP

This patch supresses a warning in the adLDAP library when a password
change is attempted but fails due to the configured Active Directory
Password Policy. Instead of the error an Exception is thrown.

This change probably needs to be replicated in the user modification
function.

Patch sent to upstream.

1 files changed, 11 insertions, 2 deletions

diff --git a/inc/adLDAP.php b/inc/adLDAP.php
index 4c8ee5db3..a64096b85 100644
--- a/inc/adLDAP.php
+++ b/inc/adLDAP.php
@@ -1183,8 +1183,17 @@ class adLDAP {
         $add=array();
         $add["unicodePwd"][0]=$this->encode_password($password);
 
-        $result=ldap_mod_replace($this->_conn,$user_dn,$add);
-        if ($result==false){ return (false); }
+        $result=@ldap_mod_replace($this->_conn,$user_dn,$add);
+        if ($result==false){
+            $err = ldap_errno($this->_conn);
+            if($err){
+                $msg = 'Error '.$err.': '.ldap_err2str($err).'.';
+                if($err == 53) $msg .= ' Your password might not match the password policy.';
+                throw new adLDAPException($msg);
+            }else{
+                return false;
+            }
+        }
 
         return (true);
     }