In session_chkhost get the last CN, not the first.

[openldap] / servers / slapd / sets.c

diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index dc1bc858434a29dc802156c1bbd2e89589f834de..e25d8c3fe642298f205223824dee56a2b6331a78 100644 (file)
--- a/servers/slapd/sets.c
+++ b/servers/slapd/sets.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2007 The OpenLDAP Foundation.
+ * Copyright 2000-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -120,7 +120,7 @@ set_dup( SetCookie *cp, BerVarray set, unsigned flags )
 /* Join two sets according to operator op and flags op_flags.
  * op can be:
  *     '|' (or):       the union between the two sets is returned,
- *                     eliminating diplicates
+ *                     eliminating duplicates
  *     '&' (and):      the intersection between the two sets
  *                     is returned
  *     '+' (add):      the inner product of the two sets is returned,
@@ -151,16 +151,19 @@ slap_set_join(
                                                        sizeof( struct berval ),
                                                        cp->set_op->o_tmpmemctx );
                                        BER_BVZERO( &set[ 0 ] );
-                                       return set;
+                                       goto done2;
                                }
-                               return set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
+                               set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
+                               goto done2;
                        }
                        slap_set_dispose( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
-                       return set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) );
+                       set = set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) );
+                       goto done2;
                }
                if ( rset == NULL || BER_BVISNULL( &rset[ 0 ] ) ) {
                        slap_set_dispose( cp, rset, SLAP_SET_RREF2REF( op_flags ) );
-                       return set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
+                       set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
+                       goto done2;
                }
 
                /* worst scenario: no duplicates */
@@ -182,6 +185,9 @@ slap_set_join(
                                }
                        }
 
+                       /* pointers to values have been used in set - don't free twice */
+                       op_flags |= SLAP_SET_LREFVAL;
+
                        last = i;
 
                        for ( i = 0; !BER_BVISNULL( &rset[ i ] ); i++ ) {
@@ -194,6 +200,7 @@ slap_set_join(
                                                        cp->set_op->o_tmpfree( rset[ i ].bv_val, cp->set_op->o_tmpmemctx );
                                                        rset[ i ] = rset[ --rlast ];
                                                        BER_BVZERO( &rset[ rlast ] );
+                                                       i--;
                                                }
                                                exists = 1;
                                                break;
@@ -210,6 +217,10 @@ slap_set_join(
                                        last++;
                                }
                        }
+
+                       /* pointers to values have been used in set - don't free twice */
+                       op_flags |= SLAP_SET_RREFVAL;
+
                        BER_BVZERO( &set[ last ] );
                }
                break;
@@ -232,11 +243,13 @@ slap_set_join(
 
                        /* dup the shortest */
                        if ( llen < rlen ) {
+                               last = llen;
                                set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
                                lset = NULL;
                                sset = rset;
 
                        } else {
+                               last = rlen;
                                set = set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) );
                                rset = NULL;
                                sset = lset;
@@ -246,7 +259,6 @@ slap_set_join(
                                break;
                        }
 
-                       last = slap_set_size( set );
                        for ( i = 0; !BER_BVISNULL( &set[ i ] ); i++ ) {
                                for ( j = 0; !BER_BVISNULL( &sset[ j ] ); j++ ) {
                                        if ( bvmatch( &set[ i ], &sset[ j ] ) ) {
@@ -269,23 +281,13 @@ slap_set_join(
                j = slap_set_size( lset );
 
                /* handle empty set cases */
-               if ( i == 0 ) {
-                       if ( j == 0 ) {
-                               set = cp->set_op->o_tmpcalloc( i * j + 1, sizeof( struct berval ),
-                                               cp->set_op->o_tmpmemctx );
-                               if ( set == NULL ) {
-                                       break;
-                               }
-                               BER_BVZERO( &set[ 0 ] );
-                               break;
-
-                       } else {
-                               set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
+               if ( i == 0 || j == 0 ) {
+                       set = cp->set_op->o_tmpcalloc( 1, sizeof( struct berval ),
+                                       cp->set_op->o_tmpmemctx );
+                       if ( set == NULL ) {
                                break;
                        }
-
-               } else if ( j == 0 ) {
-                       set = set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) );
+                       BER_BVZERO( &set[ 0 ] );
                        break;
                }
 
@@ -354,6 +356,18 @@ done:;
        if ( lset ) slap_set_dispose( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
        if ( rset ) slap_set_dispose( cp, rset, SLAP_SET_RREF2REF( op_flags ) );
 
+done2:;
+       if ( LogTest( LDAP_DEBUG_ACL ) ) {
+               if ( BER_BVISNULL( set ) ) {
+                       Debug( LDAP_DEBUG_ACL, "  ACL set: empty\n", 0, 0, 0 );
+
+               } else {
+                       for ( i = 0; !BER_BVISNULL( &set[ i ] ); i++ ) {
+                               Debug( LDAP_DEBUG_ACL, "  ACL set[%ld]=%s\n", i, set[i].bv_val, 0 );
+                       }
+               }
+       }
+
        return set;
 }
 
@@ -696,23 +710,23 @@ slap_set_filter( SLAP_SET_GATHER gatherer,
                        break;
 
                default:
-                       if ( ( c != '_' )
-                                       && ( c < 'A' || c > 'Z' )
-                                       && ( c < 'a' || c > 'z' ) )
-                       {
+                       if ( !AD_LEADCHAR( c ) ) {
                                SF_ERROR( syntax );
                        }
                        filter--;
                        for ( len = 1;
-                                       ( c = filter[ len ] )
-                                               && ( ( c >= '0' && c <= '9' )
-                                                       || ( c >= 'A' && c <= 'Z' )
-                                                       || ( c >= 'a' && c <= 'z' ) );
-                                       len++ )
-                               /* count */ ;
+                               ( c = filter[ len ] ) && AD_CHAR( c );
+                               len++ )
+                       {
+                               /* count */
+                               if ( c == '-' && !AD_CHAR( filter[ len + 1 ] ) ) {
+                                       break;
+                               }
+                       }
                        if ( len == 4
                                && memcmp( "this", filter, len ) == 0 )
                        {
+                               assert( !BER_BVISNULL( target ) );
                                if ( ( SF_TOP() == (void *)'/' ) || IS_SET( SF_TOP() ) ) {
                                        SF_ERROR( syntax );
                                }
@@ -733,15 +747,15 @@ slap_set_filter( SLAP_SET_GATHER gatherer,
                                if ( ( SF_TOP() == (void *)'/' ) || IS_SET( SF_TOP() ) ) {
                                        SF_ERROR( syntax );
                                }
+                               if ( BER_BVISNULL( user ) ) {
+                                       SF_ERROR( memory );
+                               }
                                set = cp->set_op->o_tmpcalloc( 2, sizeof( struct berval ),
                                                cp->set_op->o_tmpmemctx );
                                if ( set == NULL ) {
                                        SF_ERROR( memory );
                                }
                                ber_dupbv_x( set, user, cp->set_op->o_tmpmemctx );
-                               if ( BER_BVISNULL( set ) ) {
-                                       SF_ERROR( memory );
-                               }
                                BER_BVZERO( &set[ 1 ] );
                                
                        } else if ( SF_TOP() != (void *)'/' ) {