com php-src: Merge branch 'PHP-5.6': ext/ldap/ldap.c
| From: | Stanislav Malyshev | Date: | Sun, 28 Sep 2014 19:28:30 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/ldap/ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82000@lists.php.net to get a copy of this message | ||
Commit: 3fd8a76f268984bf9dc39e4ed57983f92da1776b
Author: Stanislav Malyshev <stas@php.net> Sun, 28 Sep 2014 12:28:30 -0700
Parents: e14b7f629b036f11d875d21b8cb27b079323ce27 a8e84b1b21c80ec1060f5afeb146b13ddf267d3e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3fd8a76f268984bf9dc39e4ed57983f92da1776b
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Set an LDAP error code when failing ldap_bind due to null bytes
Conflicts:
ext/ldap/ldap.c
Changed paths:
MM ext/ldap/ldap.c
Diff:
diff --cc ext/ldap/ldap.c
index f00799e,8a141c0..f74de69
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@@ -402,7 -422,10 +419,10 @@@ PHP_FUNCTION(ldap_bind
RETURN_FALSE;
}
- ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, &link, -1, "ldap link", le_link);
++ ZEND_FETCH_RESOURCE(ld, ldap_linkdata *, link, -1, "ldap link", le_link);
+
if (ldap_bind_dn != NULL && memchr(ldap_bind_dn, '\0', ldap_bind_dnlen) !=
NULL) {
+ _set_lderrno(ld->link, LDAP_INVALID_CREDENTIALS);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "DN contains a null byte");
RETURN_FALSE;
}