/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "slap.h"
#include "back-bdb.h"
-#include "external.h"
/*
* sets *hasSubordinates to LDAP_COMPARE_TRUE/LDAP_COMPARE_FALSE
{
int rc;
- assert( e );
+ assert( e != NULL );
/* NOTE: this should never happen, but it actually happens
* when using back-relay; until we find a better way to
break;
default:
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR,
- "=> bdb_hasSubordinates: has_children failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
-#else
Debug(LDAP_DEBUG_ARGS,
- "<=- bdb_hasSubordinates: has_children failed: %s (%d)\n",
+ "<=- " LDAP_XSTRING(bdb_hasSubordinates)
+ ": has_children failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
-#endif
rc = LDAP_OTHER;
}
{
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 ( SLAP_OPATTRS( rs->sr_attr_flags ) ||
ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) )
{
- int hasSubordinates;
+ int hasSubordinates, rc;
- rs->sr_err = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates );
- if ( rs->sr_err == LDAP_SUCCESS ) {
+ rc = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates );
+ if ( rc == LDAP_SUCCESS ) {
*ap = slap_operational_hasSubordinate( hasSubordinates == LDAP_COMPARE_TRUE );
- assert( *ap );
+ assert( *ap != NULL );
ap = &(*ap)->a_next;
}
}
- return rs->sr_err;
+ return LDAP_SUCCESS;
}