drop conditon

remicollet · remicollet · commit eb258253d3e9 · 2025-02-27T07:14:06.000+01:00
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
@@ -988,10 +988,10 @@ PHP_FUNCTION(ldap_connect)
 		}
 
 #ifdef LDAP_OPT_X_TLS_NEWCTX
-		if (!memcmp(url, "ldaps:", 6)) {
+		{
 			int val = 0;
 
-			/* ensure all pending TLS options are applied in a new context */
+			/* ensure all pending TLS options are applied in a new context (for ldaps or later starttls) */
 			if (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {
 				php_error_docref(NULL, E_WARNING, "Could not create new security context");
 			}

Original file line number	Diff line number	Diff line change
`@@ -988,10 +988,10 @@ PHP_FUNCTION(ldap_connect)`
`988`	`988`	`}`
`989`	`989`
`990`	`990`	`#ifdef LDAP_OPT_X_TLS_NEWCTX`
`991`		`- if (!memcmp(url, "ldaps:", 6)) {`
	`991`	`+ {`
`992`	`992`	`int val = 0;`
`993`	`993`
`994`		`- /* ensure all pending TLS options are applied in a new context */`
	`994`	`+ /* ensure all pending TLS options are applied in a new context (for ldaps or later starttls) */`
`995`	`995`	`if (ldap_set_option(NULL, LDAP_OPT_X_TLS_NEWCTX, &val) != LDAP_OPT_SUCCESS) {`
`996`	`996`	`php_error_docref(NULL, E_WARNING, "Could not create new security context");`
`997`	`997`	`}`