- Fixed bug #42015 (ldap_rename() gets server error "DSA is unwilling to perform")

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 4146af1400d9f421513fedb96bfb4320662291db..b1de02f551cf02f61bf2349ad20f1c6b36d06472 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2074,6 +2074,7 @@ PHP_FUNCTION(ldap_rename)
        zval **link, **dn, **newrdn, **newparent, **deleteoldrdn;
        ldap_linkdata *ld;
        int rc;
+       char *newp = NULL;
        
        if (ZEND_NUM_ARGS() != 5 || zend_get_parameters_ex(5, &link, &dn, &newrdn, &newparent, &deleteoldrdn) == FAILURE) {
                WRONG_PARAM_COUNT;
@@ -2086,10 +2087,12 @@ PHP_FUNCTION(ldap_rename)
        convert_to_string_ex(newparent);
        convert_to_boolean_ex(deleteoldrdn);
 
+       newp = (Z_STRLEN_PP(newparent) > 0) ?  Z_STRVAL_PP(newparent) : NULL;
+
 #if (LDAP_API_VERSION > 2000) || HAVE_NSLDAP || HAVE_ORALDAP_10
-       rc = ldap_rename_s(ld->link, Z_STRVAL_PP(dn), Z_STRVAL_PP(newrdn), Z_STRVAL_PP(newparent), Z_BVAL_PP(deleteoldrdn), NULL, NULL);
+       rc = ldap_rename_s(ld->link, Z_STRVAL_PP(dn), Z_STRVAL_PP(newrdn), newp, Z_BVAL_PP(deleteoldrdn), NULL, NULL);
 #else
-       if (Z_STRLEN_PP(newparent) != 0) {
+       if (newp != NULL) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "You are using old LDAP API, newparent must be the empty string, can only modify RDN");
                RETURN_FALSE;
        }