diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:58:54 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-08-20 13:58:54 +0200 |
| commit | ae923287cada2bb59877e806c8219b74f7d857d5 (patch) | |
| tree | 68224af6a22409f5460c29535602f17c6337ca5a | |
| parent | a18f53ec2c86a45ac69b5ffa26b29903a122e206 (diff) | |
| parent | 963b40c9a8921c99320db83ca35968aa595f40b3 (diff) | |
| download | php-git-ae923287cada2bb59877e806c8219b74f7d857d5.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Don't use C++ style comments
| -rw-r--r-- | ext/ldap/ldap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 4460204071..15cd0c3281 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -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) { |