From: Stig Venaas <venaas@php.net>
Date: Sun, 29 Mar 2009 18:44:45 +0000 (+0000)
Subject: added OpenLDAP TLS options to ldap_get_option/ldap_set_option
X-Git-Tag: php-5.4.0alpha1~191^2~4026
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64c6587bd971eb06194edaa8c5b480ea5faaa938;p=php

added OpenLDAP TLS options to ldap_get_option/ldap_set_option
---

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 6135a25930..fae6dd0917 100644
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -187,6 +187,17 @@ PHP_MINIT_FUNCTION(ldap)
 	REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_AUTHZID", LDAP_OPT_X_SASL_AUTHZID, CONST_PERSISTENT | CONST_CS);
 #endif
 
+#ifdef LDAP_OPT_X_TLS
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CACERTFILE", LDAP_OPT_X_TLS_CACERTFILE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CACERTDIR", LDAP_OPT_X_TLS_CACERTDIR, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CERTFILE", LDAP_OPT_X_TLS_CERTFILE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_KEYFILE",  LDAP_OPT_X_TLS_KEYFILE, CONST_PERSISTENT | CONST_CS);
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_REQUIRE_CERT", LDAP_OPT_X_TLS_REQUIRE_CERT, CONST_PERSISTENT | CONST_CS);
+#ifdef LDAP_OPT_X_TLS_CRLCHECK
+	REGISTER_LONG_CONSTANT("LDAP_OPT_X_TLS_CRLCHECK", LDAP_OPT_X_TLS_CRLCHECK, CONST_PERSISTENT | CONST_CS);
+#endif	
+#endif         
+
 #ifdef ORALDAP
 	REGISTER_LONG_CONSTANT("GSLC_SSL_NO_AUTH", GSLC_SSL_NO_AUTH, CONST_PERSISTENT | CONST_CS);
 	REGISTER_LONG_CONSTANT("GSLC_SSL_ONEWAY_AUTH", GSLC_SSL_ONEWAY_AUTH, CONST_PERSISTENT | CONST_CS);
@@ -1604,6 +1615,12 @@ PHP_FUNCTION(ldap_get_option)
 #ifdef LDAP_OPT_RESTART
 	case LDAP_OPT_RESTART:
 #endif
+#ifdef LDAP_OPT_X_TLS
+	case LDAP_OPT_X_TLS_REQUIRE_CERT:
+#ifdef LDAP_OPT_X_TLS_CRLCHECK
+	case LDAP_OPT_X_TLS_CRLCHECK:
+#endif
+#endif		
 		{
 			int val;
 
@@ -1651,6 +1668,12 @@ PHP_FUNCTION(ldap_get_option)
 	case LDAP_OPT_X_SASL_AUTHCID:
 	case LDAP_OPT_X_SASL_AUTHZID:
 #endif
+#ifdef LDAP_OPT_X_TLS
+	case LDAP_OPT_X_TLS_CACERTFILE:
+	case LDAP_OPT_X_TLS_CACERTDIR:
+	case LDAP_OPT_X_TLS_CERTFILE:
+	case LDAP_OPT_X_TLS_KEYFILE:
+#endif         
 #ifdef LDAP_OPT_MATCHED_DN
 	case LDAP_OPT_MATCHED_DN:
 #endif
@@ -1710,6 +1733,12 @@ PHP_FUNCTION(ldap_set_option)
 #ifdef LDAP_OPT_DEBUG_LEVEL
 	case LDAP_OPT_DEBUG_LEVEL:
 #endif
+#ifdef LDAP_OPT_X_TLS
+	case LDAP_OPT_X_TLS_REQUIRE_CERT:
+#ifdef LDAP_OPT_X_TLS_CRLCHECK
+	case LDAP_OPT_X_TLS_CRLCHECK:
+#endif
+#endif		
 		{
 			int val;
 
@@ -1754,6 +1783,12 @@ PHP_FUNCTION(ldap_set_option)
 	case LDAP_OPT_X_SASL_AUTHCID:
 	case LDAP_OPT_X_SASL_AUTHZID:
 #endif
+#ifdef LDAP_OPT_X_TLS
+	case LDAP_OPT_X_TLS_CACERTFILE:
+	case LDAP_OPT_X_TLS_CACERTDIR:
+	case LDAP_OPT_X_TLS_CERTFILE:
+	case LDAP_OPT_X_TLS_KEYFILE:
+#endif         
 #ifdef LDAP_OPT_MATCHED_DN
 	case LDAP_OPT_MATCHED_DN:
 #endif