use slab memory for proxyauthz

[openldap] / servers / slapd / back-ldbm / operational.c

diff --git a/servers/slapd/back-ldbm/operational.c b/servers/slapd/back-ldbm/operational.c
index e3070e5e19611a41f0b4ae34ab35b529a96ea952..384437cbf836a1dfd3871095d06b6de964727e7e 100644 (file)
--- a/servers/slapd/back-ldbm/operational.c
+++ b/servers/slapd/back-ldbm/operational.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -55,19 +55,19 @@ ldbm_back_operational(
 {
        Attribute       **ap;
 
-       assert( rs->sr_entry );
+       assert( rs->sr_entry != NULL );
 
        for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next )
                /* just count */ ;
 
-       if ( rs->sr_opattrs == SLAP_OPATTRS ||
+       if ( SLAP_OPATTRS( rs->sr_attr_flags ) ||
                        ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) )
        {
                int     hs;
 
                hs = has_children( op->o_bd, rs->sr_entry );
                *ap = slap_operational_hasSubordinate( hs );
-               assert( *ap );
+               assert( *ap != NULL );
 
                ap = &(*ap)->a_next;
        }