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 90f2fb7647b3bd8477367838d0cf4c0777eb867f..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 );
@@ -2319,7 +2321,7 @@ integerBitAndMatch(
                return LDAP_CONSTRAINT_VIOLATION;
        }
 
-       *matchp = (lValue & lAssertedValue) ? 0 : 1;
+       *matchp = ((lValue & lAssertedValue) == lAssertedValue) ? 0 : 1;
        return LDAP_SUCCESS;
 }
 
@@ -2350,7 +2352,7 @@ integerBitOrMatch(
                return LDAP_CONSTRAINT_VIOLATION;
        }
 
-       *matchp = (lValue | lAssertedValue) ? 0 : -1;
+       *matchp = ((lValue & lAssertedValue) != 0) ? 0 : -1;
        return LDAP_SUCCESS;
 }
 
@@ -2360,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;
@@ -2394,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 );
@@ -2469,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 );
@@ -2898,7 +2897,6 @@ int generalizedTimeIndexer(
        void *ctx )
 {
        int i, j;
-       size_t slen, mlen;
        BerVarray keys;
        char tmp[5];
        BerValue bvtmp; /* 40 bit index */