com php-src: Fixed ldap_exop_whoami and added a tes t for it: ext/ldap/ldap.c
| From: | Côme Bernigaud | Date: | Mon, 03 Jul 2017 08:58:12 +0000 |
| Subject: | com php-src: Fixed ldap_exop_whoami and added a tes t for it: ext/ldap/ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98391@lists.php.net to get a copy of this message | ||
Commit: fdafd6841947da34579952fc3eb39ecdf880407b
Author: Côme Chilliet <mcmic@php.net> Tue, 20 Jun 2017 17:44:04 +0200
Parents: ae76c8ba2c41a3883672f3ddc6d93fd65aaa3b4e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fdafd6841947da34579952fc3eb39ecdf880407b
Log:
Fixed ldap_exop_whoami and added a test for it
Changed paths:
M ext/ldap/ldap.c
Diff:
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index c5a80f9..4fe4961 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -2672,13 +2672,13 @@ PHP_FUNCTION(ldap_parse_exop_passwd)
Extract information from <draft-zeilenga-ldap-authzid> whoami extended operation result (a
Work in Progress) */
PHP_FUNCTION(ldap_parse_exop_whoami)
{
- zval *link, *result, **authzid;
+ zval *link, *result, *authzid;
ldap_linkdata *ld;
LDAPMessage *ldap_result;
struct berval *lauthzid;
int rc, myargcount = ZEND_NUM_ARGS();
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrZ", &link, &result,
&authzid) != SUCCESS) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrz/", &link, &result,
&authzid) != SUCCESS) {
WRONG_PARAM_COUNT;
}
@@ -2696,11 +2696,11 @@ PHP_FUNCTION(ldap_parse_exop_whoami)
RETURN_FALSE;
}
- zval_dtor(*authzid);
+ zval_dtor(authzid);
if (lauthzid == NULL) {
- ZVAL_EMPTY_STRING(*authzid);
+ ZVAL_EMPTY_STRING(authzid);
} else {
- ZVAL_STRINGL(*authzid, lauthzid->bv_val, lauthzid->bv_len);
+ ZVAL_STRINGL(authzid, lauthzid->bv_val, lauthzid->bv_len);
ldap_memfree(lauthzid->bv_val);
ldap_memfree(lauthzid);
}
@@ -3496,7 +3496,7 @@ PHP_FUNCTION(ldap_exop_whoami)
LDAPMessage *ldap_res;
int rc, msgid, myargcount = ZEND_NUM_ARGS();
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|z", &link, &authzid) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|z/", &link, &authzid) ==
FAILURE) {
WRONG_PARAM_COUNT;
}