fix ITS#3411

diff --git a/CHANGES b/CHANGES
index 10ff50d445acdd3ec92ad13045b69d4787ca678c..b7edc808d2d3ca2d971ced2c1be15f27897f7b08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.2 Change Log
 
 OpenLDAP 2.2.20 Engineering
+       Fixed slapd sanity check on protocol in authz-regexp URI (ITS#3411)
        Fixed back-sql segfault when logging and delete_rule is NULL (ITS#3407)
 
 OpenLDAP 2.2.19 Release

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index c42a7eb8a1088ac5e33227333f12bc738de760d1..1ac6a32c395dfcd408a201e938c4e68a92b716e0 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -314,12 +314,14 @@ is_dn:            bv.bv_len = uri->bv_len - (bv.bv_val - uri->bv_val);
        rc = ldap_url_parse( uri->bv_val, &ludp );
        switch ( rc ) {
        case LDAP_URL_SUCCESS:
+#if 0 /* leave this for later releases */
                if ( strcasecmp( ludp->lud_scheme, "ldap" ) != 0 ) {
                        /*
                         * must be ldap:///
                         */
                        return LDAP_PROTOCOL_ERROR;
                }
+#endif
                break;
  
        case LDAP_URL_ERR_BADSCHEME: