don't send error with back-meta

[openldap] / servers / slapd / operational.c

diff --git a/servers/slapd/operational.c b/servers/slapd/operational.c
index 44372f596e23fd070c1d58956697c02426f70467..121d5938ed662764087960ad7dcf7b27c19e9c7a 100644 (file)
--- a/servers/slapd/operational.c
+++ b/servers/slapd/operational.c
@@ -1,7 +1,7 @@
 /* operational.c - routines to deal with on-the-fly operational attrs */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@ slap_operational_subschemaSubentry( Backend *be )
        Attribute       *a;
 
        /* The backend wants to take care of it */
-       if ( be && be!= frontendDB && be->be_schemadn.bv_val ) return NULL;
+       if ( be && !SLAP_FRONTEND(be) && be->be_schemadn.bv_val ) return NULL;
 
        a = ch_malloc( sizeof( Attribute ) );
        a->a_desc = slap_schema.si_ad_subschemaSubentry;
@@ -53,7 +53,7 @@ slap_operational_entryDN( Entry *e )
 {
        Attribute       *a;
 
-       assert( e );
+       assert( e != NULL );
        assert( !BER_BVISNULL( &e->e_name ) );
        assert( !BER_BVISNULL( &e->e_nname ) );