Fix -USLAPD_SCHEMA_NOT_COMPAT

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index abeac6f4dc71487af8146d4bf22e938e05440ff2..ff076944fc1053f55c8d86ed206d7280cb452a1c 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -97,6 +97,7 @@ int slap_bv2ad(
        char **tokens;
 
        assert( ad != NULL );
+       assert( *ad == NULL ); /* temporary */
        assert( *text != NULL );
 
        if( bv == NULL || bv->bv_len == 0 ) {

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index dc9ef6fc443aaa4ed81abe5ed7f6639207af450e..02817d244244c46939cab8e74721109ee18e6b94 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -98,9 +98,10 @@ get_filter(
                        break;
                }
 
-               assert( f->f_ava != NULL );
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
+               assert( f->f_ava != NULL );
+
                *fstr = ch_malloc( sizeof("(=)")
                        + f->f_av_desc->ad_cname->bv_len
                        + f->f_av_value->bv_len );

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 39f1acc5e5a6d6571291c82e7f04f0a42844168c..ec6334da557f6d7b038eff43e4b8da499c50e97c 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -102,7 +102,7 @@ schema_info( Entry **entry, char **text )
        {
                /* Out of memory, do something about it */
                entry_free( e );
-               text = "out of memory";
+               *text = "out of memory";
                return LDAP_OTHER;
        }