From: Côme Chilliet <mcmic@php.net>
Date: Mon, 26 Jun 2017 12:57:04 +0000 (+0200)
Subject: Added constants for standard EXOPs
X-Git-Tag: php-7.2.0beta1~144^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9aa99cc34cdecfa052a06835c40faf9c8c1a1157;p=php

Added constants for standard EXOPs
---

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index a706c71f6e..19340d17d0 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -283,6 +283,14 @@ PHP_MINIT_FUNCTION(ldap)
 	REGISTER_LONG_CONSTANT("LDAP_ESCAPE_FILTER", PHP_LDAP_ESCAPE_FILTER, CONST_PERSISTENT | CONST_CS);
 	REGISTER_LONG_CONSTANT("LDAP_ESCAPE_DN", PHP_LDAP_ESCAPE_DN, CONST_PERSISTENT | CONST_CS);
 
+#ifdef HAVE_LDAP_EXTENDED_OPERATION_S
+	REGISTER_STRING_CONSTANT("LDAP_EXOP_START_TLS", LDAP_EXOP_START_TLS, CONST_PERSISTENT | CONST_CS);
+	REGISTER_STRING_CONSTANT("LDAP_EXOP_MODIFY_PASSWD", LDAP_EXOP_MODIFY_PASSWD, CONST_PERSISTENT | CONST_CS);
+	REGISTER_STRING_CONSTANT("LDAP_EXOP_REFRESH", LDAP_EXOP_REFRESH, CONST_PERSISTENT | CONST_CS);
+	REGISTER_STRING_CONSTANT("LDAP_EXOP_WHO_AM_I", LDAP_EXOP_WHO_AM_I, CONST_PERSISTENT | CONST_CS);
+	REGISTER_STRING_CONSTANT("LDAP_EXOP_TURN", LDAP_EXOP_TURN, CONST_PERSISTENT | CONST_CS);
+#endif
+
 	le_link = zend_register_list_destructors_ex(_close_ldap_link, NULL, "ldap link", module_number);
 	le_result = zend_register_list_destructors_ex(_free_ldap_result, NULL, "ldap result", module_number);
 	le_result_entry = zend_register_list_destructors_ex(_free_ldap_result_entry, NULL, "ldap result entry", module_number);
diff --git a/ext/ldap/tests/ldap_exop.phpt b/ext/ldap/tests/ldap_exop.phpt
index 883bfa5de5..5f93a02093 100644
--- a/ext/ldap/tests/ldap_exop.phpt
+++ b/ext/ldap/tests/ldap_exop.phpt
@@ -23,10 +23,10 @@ function ber_encode($string) {
 // ldap_exop(resource link, string reqoid [, string reqdata [, string retoid [, string retdata]]])
 // bool ldap_parse_exop(resource link, resource result [, string retoid [, string retdata]])
 var_dump(
-	ldap_exop($link, "1.3.6.1.4.1.4203.1.11.3", NULL, $retoid, $retdata),
+	ldap_exop($link, LDAP_EXOP_WHO_AM_I, NULL, $retoid, $retdata),
 	$retdata,
 	$retoid,
-	$r = ldap_exop($link, "1.3.6.1.4.1.4203.1.11.3"),
+	$r = ldap_exop($link, LDAP_EXOP_WHO_AM_I),
 	ldap_parse_exop($link, $r, $retoid2, $retdata2),
 	$retdata2,
 	$retoid2