update for new backend types

[openldap] / servers / slapd / schema_init.c

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 4f4edc6c353bda6baba27dcab305bf161180f2b6..7b5d1ff435ba9b0dbbdf429a180a39afe1ec17de 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -17,7 +17,9 @@
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include <ac/ctype.h>
 #include <ac/errno.h>
@@ -402,7 +404,7 @@ octetStringSubstringsIndexer(
        BerVarray *keysp,
        void *ctx )
 {
-       ber_len_t i, j, len, nkeys;
+       ber_len_t i, nkeys;
        size_t slen, mlen;
        BerVarray keys;
 
@@ -519,7 +521,7 @@ octetStringSubstringsFilter (
 {
        SubstringsAssertion *sa;
        char pre;
-       ber_len_t len, max, nkeys = 0;
+       ber_len_t nkeys = 0;
        size_t slen, mlen, klen;
        BerVarray keys;
        HASH_CONTEXT HASHcontext;
@@ -890,8 +892,8 @@ nameUIDPretty(
        struct berval *out,
        void *ctx )
 {
-       assert( val );
-       assert( out );
+       assert( val != NULL );
+       assert( out != NULL );
 
 
        Debug( LDAP_DEBUG_TRACE, ">>> nameUIDPretty: <%s>\n", val->bv_val, 0, 0 );
@@ -1060,6 +1062,7 @@ uniqueMemberMatch(
        struct berval assertedUID = BER_BVNULL;
        struct berval valueDN = BER_BVNULL;
        struct berval valueUID = BER_BVNULL;
+       int approx = ((flags & SLAP_MR_EQUALITY_APPROX) == SLAP_MR_EQUALITY_APPROX);
 
        if ( !BER_BVISEMPTY( asserted ) ) {
                assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' );
@@ -1107,11 +1110,109 @@ uniqueMemberMatch(
                        *matchp = match;
                        return LDAP_SUCCESS;
                }
+
+       } else if ( !approx && valueUID.bv_len ) {
+               match = -1;
+               *matchp = match;
+               return LDAP_SUCCESS;
+
+       } else if ( !approx && assertedUID.bv_len ) {
+               match = 1;
+               *matchp = match;
+               return LDAP_SUCCESS;
        }
 
        return dnMatch( matchp, flags, syntax, mr, &valueDN, &assertedDN );
 }
 
+static int 
+uniqueMemberIndexer(
+       slap_mask_t use,
+       slap_mask_t flags,
+       Syntax *syntax,
+       MatchingRule *mr,
+       struct berval *prefix,
+       BerVarray values,
+       BerVarray *keysp,
+       void *ctx )
+{
+       BerVarray dnvalues;
+       int rc;
+       int i;
+       for( i=0; !BER_BVISNULL( &values[i] ); i++ ) {
+               /* just count them */                 
+       }
+       assert( i > 0 );
+
+       dnvalues = slap_sl_malloc( sizeof( struct berval ) * (i+1), ctx );
+
+       for( i=0; !BER_BVISNULL( &values[i] ); i++ ) {
+               struct berval assertedDN = values[i];
+               struct berval assertedUID = BER_BVNULL;
+
+               if ( !BER_BVISEMPTY( &assertedDN ) ) {
+                       assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' );
+                       if ( !BER_BVISNULL( &assertedUID ) ) {
+                               assertedUID.bv_val++;
+                               assertedUID.bv_len = assertedDN.bv_len
+                                       - ( assertedUID.bv_val - assertedDN.bv_val );
+       
+                               if ( bitStringValidate( NULL, &assertedUID ) == LDAP_SUCCESS ) {
+                                       assertedDN.bv_len -= assertedUID.bv_len + 1;
+
+                               } else {
+                                       BER_BVZERO( &assertedUID );
+                               }
+                       }
+               }
+
+               dnvalues[i] = assertedDN;
+       }
+       BER_BVZERO( &dnvalues[i] );
+
+       rc = octetStringIndexer( use, flags, syntax, mr, prefix,
+               dnvalues, keysp, ctx );
+
+       slap_sl_free( dnvalues, ctx );
+       return rc;
+}
+
+static int 
+uniqueMemberFilter(
+       slap_mask_t use,
+       slap_mask_t flags,
+       Syntax *syntax,
+       MatchingRule *mr,
+       struct berval *prefix,
+       void * assertedValue,
+       BerVarray *keysp,
+       void *ctx )
+{
+       struct berval *asserted = (struct berval *) assertedValue;
+       struct berval assertedDN = *asserted;
+       struct berval assertedUID = BER_BVNULL;
+
+       if ( !BER_BVISEMPTY( asserted ) ) {
+               assertedUID.bv_val = strrchr( assertedDN.bv_val, '#' );
+               if ( !BER_BVISNULL( &assertedUID ) ) {
+                       assertedUID.bv_val++;
+                       assertedUID.bv_len = assertedDN.bv_len
+                               - ( assertedUID.bv_val - assertedDN.bv_val );
+
+                       if ( bitStringValidate( NULL, &assertedUID ) == LDAP_SUCCESS ) {
+                               assertedDN.bv_len -= assertedUID.bv_len + 1;
+
+                       } else {
+                               BER_BVZERO( &assertedUID );
+                       }
+               }
+       }
+
+       return octetStringFilter( use, flags, syntax, mr, prefix,
+               &assertedDN, keysp, ctx );
+}
+
+
 /*
  * Handling boolean syntax and matching is quite rigid.
  * A more flexible approach would be to allow a variety
@@ -2220,7 +2321,7 @@ integerBitAndMatch(
                return LDAP_CONSTRAINT_VIOLATION;
        }
 
-       *matchp = (lValue & lAssertedValue) ? 0 : 1;
+       *matchp = ((lValue & lAssertedValue) == lAssertedValue) ? 0 : 1;
        return LDAP_SUCCESS;
 }
 
@@ -2251,7 +2352,7 @@ integerBitOrMatch(
                return LDAP_CONSTRAINT_VIOLATION;
        }
 
-       *matchp = (lValue | lAssertedValue) ? 0 : -1;
+       *matchp = ((lValue & lAssertedValue) != 0) ? 0 : -1;
        return LDAP_SUCCESS;
 }
 
@@ -2261,7 +2362,6 @@ serialNumberAndIssuerValidate(
        struct berval *in )
 {
        int rc;
-       int state;
        ber_len_t n;
        struct berval sn, i;
        if( in->bv_len < 3 ) return LDAP_INVALID_SYNTAX;
@@ -2295,12 +2395,11 @@ serialNumberAndIssuerPretty(
        void *ctx )
 {
        int rc;
-       int state;
        ber_len_t n;
        struct berval sn, i, newi;
 
-       assert( val );
-       assert( out );
+       assert( val != NULL );
+       assert( out != NULL );
 
        Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerPretty: <%s>\n",
                val->bv_val, 0, 0 );
@@ -2370,12 +2469,11 @@ serialNumberAndIssuerNormalize(
        void *ctx )
 {
        int rc;
-       int state;
        ber_len_t n;
        struct berval sn, i, newi;
 
-       assert( val );
-       assert( out );
+       assert( val != NULL );
+       assert( out != NULL );
 
        Debug( LDAP_DEBUG_TRACE, ">>> serialNumberAndIssuerNormalize: <%s>\n",
                val->bv_val, 0, 0 );
@@ -2799,7 +2897,6 @@ int generalizedTimeIndexer(
        void *ctx )
 {
        int i, j;
-       size_t slen, mlen;
        BerVarray keys;
        char tmp[5];
        BerValue bvtmp; /* 40 bit index */
@@ -3638,7 +3735,7 @@ static slap_mrule_defs_rec mrule_defs[] = {
                "SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )",
                SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL,
                NULL, uniqueMemberNormalize, uniqueMemberMatch,
-               NULL, NULL,
+               uniqueMemberIndexer, uniqueMemberFilter,
                NULL },
 
        {"( 2.5.13.24 NAME 'protocolInformationMatch' "