Browse Source

fixes ZF-6573

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16888 44c647ce-9c0f-0410-b52a-842ac1e357ba
sgehrig 16 years ago
parent
commit
389811169b
1 changed files with 2 additions and 4 deletions
  1. 2 4
      library/Zend/Ldap.php

+ 2 - 4
library/Zend/Ldap.php

@@ -543,10 +543,6 @@ class Zend_Ldap
                 Zend_Ldap_Exception::LDAP_X_DOMAIN_MISMATCH);
         }
 
-        if ($form === Zend_Ldap::ACCTNAME_FORM_DN) {
-            return $this->_getAccountDn($acctname);
-        }
-
         if (!$uname) {
             /**
              * @see Zend_Ldap_Exception
@@ -562,6 +558,8 @@ class Zend_Ldap
         }
 
         switch ($form) {
+            case Zend_Ldap::ACCTNAME_FORM_DN:
+                return $this->_getAccountDn($acctname);
             case Zend_Ldap::ACCTNAME_FORM_USERNAME:
                 return $uname;
             case Zend_Ldap::ACCTNAME_FORM_BACKSLASH: