From HEAD

[openldap] / servers / slapd / saslauthz.c

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index e08cdd9bd6ab1f7ef866d5c6fc54b31c983cff41..dca9a0eb15c37e2f116a571c8dd266b9a7e239f3 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -211,35 +211,36 @@ static int slap_parseURI( Operation *op, struct berval *uri,
                        bv.bv_val++;
 
                        if ( !strncasecmp( bv.bv_val, "exact:", sizeof( "exact:" ) - 1 ) ) {
-                               bv.bv_val += sizeof( "exact" ) - 1;
+                               bv.bv_val += sizeof( "exact:" ) - 1;
                                *scope = LDAP_X_SCOPE_EXACT;
 
                        } else if ( !strncasecmp( bv.bv_val, "regex:", sizeof( "regex:" ) - 1 ) ) {
-                               bv.bv_val += sizeof( "regex" ) - 1;
+                               bv.bv_val += sizeof( "regex:" ) - 1;
                                *scope = LDAP_X_SCOPE_REGEX;
 
                        } else if ( !strncasecmp( bv.bv_val, "children:", sizeof( "chldren:" ) - 1 ) ) {
-                               bv.bv_val += sizeof( "children" ) - 1;
+                               bv.bv_val += sizeof( "children:" ) - 1;
                                *scope = LDAP_X_SCOPE_CHILDREN;
 
                        } else if ( !strncasecmp( bv.bv_val, "subtree:", sizeof( "subtree:" ) - 1 ) ) {
-                               bv.bv_val += sizeof( "subtree" ) - 1;
+                               bv.bv_val += sizeof( "subtree:" ) - 1;
                                *scope = LDAP_X_SCOPE_SUBTREE;
 
                        } else if ( !strncasecmp( bv.bv_val, "onelevel:", sizeof( "onelevel:" ) - 1 ) ) {
-                               bv.bv_val += sizeof( "onelevel" ) - 1;
+                               bv.bv_val += sizeof( "onelevel:" ) - 1;
                                *scope = LDAP_X_SCOPE_ONELEVEL;
 
                        } else {
                                return LDAP_PROTOCOL_ERROR;
                        }
+               } else {
+                       if ( bv.bv_val[ 0 ] != ':' ) {
+                               return LDAP_PROTOCOL_ERROR;
+                       }
+                       *scope = LDAP_X_SCOPE_EXACT;
+                       bv.bv_val++;
                }
 
-               if ( bv.bv_val[ 0 ] != ':' ) {
-                       return LDAP_PROTOCOL_ERROR;
-               }
-               bv.bv_val++;
-
                bv.bv_val += strspn( bv.bv_val, " " );
                /* jump here in case no type specification was present
                 * and uir was not an URI... HEADS-UP: assuming EXACT */
@@ -632,9 +633,7 @@ int slap_sasl_match( Operation *opx, struct berval *rule,
                &op.ors_filterstr );
        if( rc != LDAP_SUCCESS ) goto CONCLUDED;
 
-       /* Massive shortcut: search scope == base */
        switch ( op.oq_search.rs_scope ) {
-       case LDAP_SCOPE_BASE:
        case LDAP_X_SCOPE_EXACT:
 exact_match:
                if ( dn_match( &op.o_req_ndn, assertDN ) ) {
@@ -885,9 +884,7 @@ void slap_sasl2dn( Operation *opx,
        /* Must do an internal search */
        op.o_bd = select_backend( &op.o_req_ndn, 0, 1 );
 
-       /* Massive shortcut: search scope == base */
        switch ( op.oq_search.rs_scope ) {
-       case LDAP_SCOPE_BASE:
        case LDAP_X_SCOPE_EXACT:
                *sasldn = op.o_req_ndn;
                op.o_req_ndn.bv_len = 0;
@@ -901,6 +898,7 @@ void slap_sasl2dn( Operation *opx,
                /* correctly parsed, but illegal */
                goto FINISHED;
 
+       case LDAP_SCOPE_BASE:
        case LDAP_SCOPE_ONELEVEL:
        case LDAP_SCOPE_SUBTREE:
 #ifdef LDAP_SCOPE_SUBORDINATE