php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 04:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3' into PHP-7.4

Browse Source 
* PHP-7.3:
  Don't use C++ style comments
This commit is contained in:
Christoph M. Becker
2019-08-20 13:58:54 +02:00
parent a18f53ec2c 963b40c9a8
commit ae923287ca
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ext/ldap/ldap.c
View File

@@ -148,7 +148,7 @@ static void _php_ldap_control_to_array(LDAP *ld, LDAPControl* ctrl, zval* array,
add_assoc_bool(array, "iscritical", (ctrl->ldctl_iscritical != 0));
}
// If it is a known oid, parse to values
/* If it is a known oid, parse to values */
if (strcmp(ctrl->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE) == 0) {
int expire = 0, grace = 0, rc;
LDAPPasswordPolicyError pperr;
@@ -363,8 +363,8 @@ static int _php_ldap_control_from_array(LDAP *ld, LDAPControl** ctrl, zval* arra
rc = -1;
php_error_docref(NULL, E_WARNING, "Failed to allocate control value");
} else {
// ldap_create_assertion_control_value does not reset ld_errno, we need to do it ourselves
// See http://www.openldap.org/its/index.cgi/Incoming?id=8674
/* ldap_create_assertion_control_value does not reset ld_errno, we need to do it ourselves
See http://www.openldap.org/its/index.cgi/Incoming?id=8674 */
int success = LDAP_SUCCESS;
ldap_set_option(ld, LDAP_OPT_RESULT_CODE, &success);
rc = ldap_create_assertion_control_value(ld, ZSTR_VAL(assert), control_value);
@@ -614,7 +614,7 @@ failure:
return LDAP_SUCCESS;
}
// Failed
/* Failed */
*ctrl = NULL;
return -1;
}
@@ -1598,7 +1598,7 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope)
}
if (argcount > 8) {
// We have to parse controls again for each link as they use it
/* We have to parse controls again for each link as they use it */
_php_ldap_controls_free(&lserverctrls);
lserverctrls = _php_ldap_controls_from_array(ld->link, serverctrls);
if (lserverctrls == NULL) {