MFH: - Fixed bug #39291 (ldap_sasl_bind() misses the sasl_authc_id parameter).

diff --git a/NEWS b/NEWS
index e5eb75b0214bf32c709f696f805b79d9a786dfd2..95914ee4700da3620e0c62ef38fd361ccaff1fa2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -142,9 +142,11 @@ PHP                                                                        NEWS
   integer as sections). (Tony)
 - Fixed bug #41350 (my_thread_global_end() error during request shutdown
   on Windows). (Scott, Andrey)
-- Fixed bug #40419 (Trailing Slash in CGI request don't work). (Dmitry)
+- Fixed bug #40419 (Trailing slash in CGI request does not work). (Dmitry)
 - Fixed bug #39330 (apache2handler does not call shutdown actions before 
   apache child die). (isk at ecommerce dot com, Gopal, Tony)
+- Fixed bug #39291 (ldap_sasl_bind() misses the sasl_authc_id parameter).
+  (diafour at gmail dot com, Jani)
 - Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present).
   (Jani)
 

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index e9040442041dcb4f51d1e6298950c07346620a62..4d6331be1eae11bbb174f6d0e45e0f126fa1920d 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -503,15 +503,15 @@ typedef struct {
 
 /* {{{ _php_sasl_setdefs
  */
-static php_ldap_bictx *_php_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_realm, char *binddn, char *pass, char *sasl_authz_id)
+static php_ldap_bictx *_php_sasl_setdefs(LDAP *ld, char *sasl_mech, char *sasl_realm, char *sasl_authc_id, char *passwd, char *sasl_authz_id)
 {
        php_ldap_bictx *ctx;
 
        ctx = ber_memalloc(sizeof(php_ldap_bictx));     
        ctx->mech    = (sasl_mech) ? ber_strdup(sasl_mech) : NULL;
        ctx->realm   = (sasl_realm) ? ber_strdup(sasl_realm) : NULL;
-       ctx->authcid = (binddn) ? ber_strdup(binddn) : NULL;
-       ctx->passwd  = (pass) ? ber_strdup(pass) : NULL;
+       ctx->authcid = (sasl_authc_id) ? ber_strdup(sasl_authc_id) : NULL;
+       ctx->passwd  = (passwd) ? ber_strdup(passwd) : NULL;
        ctx->authzid = (sasl_authz_id) ? ber_strdup(sasl_authz_id) : NULL;
 
        if (ctx->mech == NULL) {
@@ -577,28 +577,29 @@ static int _php_sasl_interact(LDAP *ld, unsigned flags, void *defaults, void *in
 }
 /* }}} */
 
-/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn, string password, string sasl_mech, string sasl_realm, string sasl_authz_id, string props])
+/* {{{ proto bool ldap_sasl_bind(resource link [, string binddn, string password, string sasl_mech, string sasl_realm, string sasl_authc_id, string sasl_authz_id, string props])
    Bind to LDAP directory using SASL */
 PHP_FUNCTION(ldap_sasl_bind)
 {
        zval *link;
        ldap_linkdata *ld;
        char *binddn = NULL;
-       char *pass = NULL;
+       char *passwd = NULL;
        char *sasl_mech = NULL;
        char *sasl_realm = NULL;
        char *sasl_authz_id = NULL;
+       char *sasl_authc_id = NULL;
        char *props = NULL;
-       int rc, dn_len, pass_len, mech_len, realm_len, authz_id_len, props_len;
+       int rc, dn_len, passwd_len, mech_len, realm_len, authc_id_len, authz_id_len, props_len;
        php_ldap_bictx *ctx;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|ssssss", &link, &binddn, &dn_len, &pass, &pass_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authz_id, &authz_id_len, &props, &props_len) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|sssssss", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) == FAILURE) {
                RETURN_FALSE;
        }
 
        ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
 
-       ctx = _php_sasl_setdefs(ld->link, sasl_mech, sasl_realm, binddn, pass, sasl_authz_id);
+       ctx = _php_sasl_setdefs(ld->link, sasl_mech, sasl_realm, sasl_authc_id, passwd, sasl_authz_id);
 
        if (props) {
                ldap_set_option(ld->link, LDAP_OPT_X_SASL_SECPROPS, props);