Add additional LDAP SASL constants

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index 53afc945b1b53f52a06c876bc27c580863967525..847e66f14ff4b390599a80052163522ac5fe3b04 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -220,6 +220,12 @@ PHP_MINIT_FUNCTION(ldap)
        REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_AUTHCID", LDAP_OPT_X_SASL_AUTHCID, CONST_PERSISTENT | CONST_CS);
        REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_AUTHZID", LDAP_OPT_X_SASL_AUTHZID, CONST_PERSISTENT | CONST_CS);
 #endif
+#ifdef LDAP_OPT_X_SASL_NOCANON
+       REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_NOCANON", LDAP_OPT_X_SASL_NOCANON, CONST_PERSISTENT | CONST_CS);
+#endif
+#ifdef LDAP_OPT_X_SASL_USERNAME
+       REGISTER_LONG_CONSTANT("LDAP_OPT_X_SASL_USERNAME", LDAP_OPT_X_SASL_USERNAME, CONST_PERSISTENT | CONST_CS);
+#endif
 
 #ifdef ORALDAP
        REGISTER_LONG_CONSTANT("GSLC_SSL_NO_AUTH", GSLC_SSL_NO_AUTH, CONST_PERSISTENT | CONST_CS);
@@ -2136,6 +2142,9 @@ PHP_FUNCTION(ldap_get_option)
 #ifdef LDAP_OPT_RESTART
        case LDAP_OPT_RESTART:
 #endif
+#ifdef LDAP_OPT_X_SASL_NOCANON
+       case LDAP_OPT_X_SASL_NOCANON:
+#endif
 #ifdef LDAP_OPT_X_TLS_REQUIRE_CERT
        case LDAP_OPT_X_TLS_REQUIRE_CERT:
 #endif
@@ -2219,6 +2228,9 @@ PHP_FUNCTION(ldap_get_option)
        case LDAP_OPT_X_SASL_AUTHCID:
        case LDAP_OPT_X_SASL_AUTHZID:
 #endif
+#ifdef LDAP_OPT_X_SASL_USERNAME
+       case LDAP_OPT_X_SASL_USERNAME:
+#endif
 #if (LDAP_API_VERSION > 2000)
        case LDAP_OPT_X_TLS_CACERTDIR:
        case LDAP_OPT_X_TLS_CACERTFILE:
@@ -2397,6 +2409,9 @@ PHP_FUNCTION(ldap_set_option)
        case LDAP_OPT_REFERRALS:
 #ifdef LDAP_OPT_RESTART
        case LDAP_OPT_RESTART:
+#endif
+#ifdef LDAP_OPT_X_SASL_NOCANON
+       case LDAP_OPT_X_SASL_NOCANON:
 #endif
                {
                        void *val;