Patch php_ldap_do-ifdef.patch for LDAP related Bug #61853

Patch version 2012-04-26 10:14 UTC

Obsoleted by patches:

• patch_61853_and_61921.patch, revision 2013-02-24 16:52 UTC

Obsolete patches:

• php_ldap_do-ifdef.patch, revision 2012-04-26 10:09 UTC

Developer: etienne@lamaisondebarbie.ch

  --- ldap.orig.c	2012-04-26 12:05:23.853265982 +0200
 +++ ldap.c	2012-04-26 12:03:20.236652998 +0200
 +++ ldap.c	2012-04-26 12:13:00.767531689 +0200
  @@ -546,6 +546,10 @@
   
   /* {{{ php_set_opts
    */


  -		if ((i = ldap_modify_ext_s(ld->link, dn, ldap_mods, NULL, NULL)) != LDAP_SUCCESS) {
  +#if LDAP_API_VERSION > 2000
  +		if ((i = ldap_modify_ext_s(ld->link, dn, ldap_mods, serverctrl, clientctrl)) != LDAP_SUCCESS) {
  +#else
 +		if ((i = ldap_modify(ld->link, dn, ldap_mods)) != LDAP_SUCCESS) {
 +		if ((i = ldap_modify_s(ld->link, dn, ldap_mods)) != LDAP_SUCCESS) {
  +#endif
   			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Modify: %s", ldap_err2string(i));
   			RETVAL_FALSE;
   		} else RETVAL_TRUE;