Made ldap_modify() an alias for ldap_mod_replace(). The two were identical.

#For more info, see my posting on php-dev Dec 25th.

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index bef2df3af17470ca2324a93d7817943f5ebc84bc..3ae1661d706b686710e4fdc7986db3c704a9e398 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -94,7 +94,7 @@ function_entry ldap_functions[] = {
        PHP_FE(ldap_dn2ufn,                                                                     NULL)
        PHP_FE(ldap_add,                                                                        NULL)
        PHP_FE(ldap_delete,                                                                     NULL)
-       PHP_FE(ldap_modify,                                                                     NULL)
+       PHP_FALIAS(ldap_modify,         ldap_mod_replace,               NULL)
 
 /* additional functions for attribute based modifications, Gerrit Thomson */
        PHP_FE(ldap_mod_add,                                                            NULL)
@@ -1414,15 +1414,6 @@ PHP_FUNCTION(ldap_add)
 }
 /* }}} */
 
-/* {{{ proto int ldap_modify(int link, string dn, array entry)
-   Modify an LDAP entry */
-PHP_FUNCTION(ldap_modify)
-{
-       php_ldap_do_modify(INTERNAL_FUNCTION_PARAM_PASSTHRU, LDAP_MOD_REPLACE); 
-}
-/* }}} */
-
-
 /* three functions for attribute base modifications, gerrit Thomson */
 
 /* {{{ proto int ldap_mod_replace(int link, string dn, array entry)

diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index fd82391e1fd78f965941082ab656c8237cda6589..4fcbff9b27cc3e630717954a354a93ce668f3979 100644 (file)
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -66,7 +66,6 @@ PHP_FUNCTION(ldap_dn2ufn);
 
 PHP_FUNCTION(ldap_add);
 PHP_FUNCTION(ldap_delete);
-PHP_FUNCTION(ldap_modify);
 
 PHP_FUNCTION(ldap_mod_add);
 PHP_FUNCTION(ldap_mod_replace);