/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
return rc;
}
}
+ /* append global access controls */
+ acl_append( &be->be_acl, frontendDB->be_acl, -1 );
return backend_startup_one( be );
}
return 0;
}
-void backend_destroy_one( BackendDB *bd, int dynamic )
+/*
+ * This function is supposed to be the exact counterpart
+ * of backend_startup_one(), although this one calls bi_db_destroy()
+ * while backend_startup_one() calls bi_db_open().
+ *
+ * Make sure backend_stopdown_one() destroys resources allocated
+ * by backend_startup_one(); only call backend_destroy_one() when
+ * all stuff in a BackendDB needs to be destroyed
+ */
+void
+backend_stopdown_one( BackendDB *bd )
{
- if ( dynamic ) {
- LDAP_STAILQ_REMOVE(&backendDB, bd, slap_backend_db, be_next );
- }
-
- if ( bd->be_syncinfo ) {
- syncinfo_free( bd->be_syncinfo );
- }
-
if ( bd->be_pending_csn_list ) {
struct slap_csn_entry *csne;
csne = LDAP_TAILQ_FIRST( bd->be_pending_csn_list );
if ( bd->bd_info->bi_db_destroy ) {
bd->bd_info->bi_db_destroy( bd );
}
+}
+
+void backend_destroy_one( BackendDB *bd, int dynamic )
+{
+ if ( dynamic ) {
+ LDAP_STAILQ_REMOVE(&backendDB, bd, slap_backend_db, be_next );
+ }
+
+ if ( bd->be_syncinfo ) {
+ syncinfo_free( bd->be_syncinfo );
+ }
+
+ backend_stopdown_one( bd );
+
ber_bvarray_free( bd->be_suffix );
ber_bvarray_free( bd->be_nsuffix );
if ( !BER_BVISNULL( &bd->be_rootdn ) ) {
return NULL;
}
+void
+backend_db_insert(
+ BackendDB *be,
+ int idx
+)
+{
+ /* If idx < 0, just add to end of list */
+ if ( idx < 0 ) {
+ LDAP_STAILQ_INSERT_TAIL(&backendDB, be, be_next);
+ } else if ( idx == 0 ) {
+ LDAP_STAILQ_INSERT_HEAD(&backendDB, be, be_next);
+ } else {
+ int i;
+ BackendDB *b2;
+
+ b2 = LDAP_STAILQ_FIRST(&backendDB);
+ idx--;
+ for (i=0; i<idx; i++) {
+ b2 = LDAP_STAILQ_NEXT(b2, be_next);
+ }
+ LDAP_STAILQ_INSERT_AFTER(&backendDB, b2, be, be_next);
+ }
+}
+
+void
+backend_db_move(
+ BackendDB *be,
+ int idx
+)
+{
+ LDAP_STAILQ_REMOVE(&backendDB, be, slap_backend_db, be_next);
+ backend_db_insert(be, idx);
+}
BackendDB *
backend_db_init(
const char *type,
- BackendDB *be )
+ BackendDB *b0,
+ int idx )
{
BackendInfo *bi = backend_info(type);
+ BackendDB *be = b0;
int rc = 0;
if( bi == NULL ) {
*/
if ( !be ) {
be = ch_calloc( 1, sizeof(Backend) );
+ /* Just append */
+ if ( idx >= nbackends )
+ idx = -1;
nbackends++;
- LDAP_STAILQ_INSERT_TAIL(&backendDB, be, be_next);
+ backend_db_insert( be, idx );
}
be->bd_info = bi;
if ( rc != 0 ) {
fprintf( stderr, "database init failed (%s)\n", type );
- nbackends--;
- return NULL;
+ /* If we created and linked this be, remove it and free it */
+ if ( !b0 ) {
+ LDAP_STAILQ_REMOVE(&backendDB, be, slap_backend_db, be_next);
+ ch_free( be );
+ be = NULL;
+ nbackends--;
+ }
+ } else {
+ bi->bi_nDB++;
}
-
- bi->bi_nDB++;
return( be );
}
}
if ( frontendDB->bd_info->bi_db_close ) {
- (*frontendDB->bd_info->bi_db_close)( frontendDB );
+ frontendDB->bd_info->bi_db_close( frontendDB );
}
}
Backend *be, *b2 = NULL;
LDAP_STAILQ_FOREACH( be, &backendDB, be_next ) {
- if ( be->be_nsuffix == NULL ) {
+ if ( be->be_nsuffix == NULL || SLAP_DBHIDDEN( be )) {
continue;
}
int
be_shadow_update( Operation *op )
{
- return ( SLAP_SYNC_SHADOW( op->o_bd ) ||
+ /* This assumes that all internal ops (connid == -1) on a syncrepl
+ * database are syncrepl operations.
+ */
+ return (( SLAP_SYNC_SHADOW( op->o_bd ) && op->o_connid == -1 ) ||
( SLAP_SHADOW( op->o_bd ) && be_isupdate_dn( op->o_bd, &op->o_ndn ) ) );
}
/* unrecognized control */
if ( (*ctrls)->ldctl_iscritical ) {
/* should not be reachable */
- Debug( LDAP_DEBUG_ANY,
- "backend_check_controls: unrecognized control: %s\n",
+ Debug( LDAP_DEBUG_ANY, "backend_check_controls: "
+ "unrecognized critical control: %s\n",
(*ctrls)->ldctl_oid, 0, 0 );
assert( 0 );
+ } else {
+ Debug( LDAP_DEBUG_TRACE, "backend_check_controls: "
+ "unrecognized non-critical control: %s\n",
+ (*ctrls)->ldctl_oid, 0, 0 );
}
break;
case LDAP_COMPARE_FALSE:
if ( !op->o_bd->be_ctrls[cid] && (*ctrls)->ldctl_iscritical ) {
- /* Per RFC 2251 (and LDAPBIS discussions), if the control
- * is recognized and appropriate for the operation (which
- * we've already verified), then the server should make
- * use of the control when performing the operation.
- *
- * Here we find that operation extended by the control
- * is unavailable in a particular context, and the control
- * is marked Critical, hence the return of
- * unwillingToPerform.
+ /* RFC 4511 allows unavailableCriticalExtension to be
+ * returned when the server is unwilling to perform
+ * an operation extended by a recognized critical
+ * control.
*/
rs->sr_text = "critical control unavailable in context";
- rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+ rs->sr_err = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
goto done;
}
break;
}
}
- /* temporarily removed */
-#if 0
+#if 0 /* temporarily removed */
/* check should be generalized */
- if( get_manageDIT(op) && !be_isroot(op)) {
+ if( get_relax(op) && !be_isroot(op)) {
rs->sr_text = "requires manager authorization";
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
}
AttributeDescription *group_at )
{
Entry *e;
+ void *o_priv = op->o_private, *e_priv = NULL;
Attribute *a;
int rc;
GroupAssertion *g;
e = target;
rc = 0;
} else {
+ op->o_private = NULL;
rc = be_entry_get_rw( op, gr_ndn, group_oc, group_at, 0, &e );
+ e_priv = op->o_private;
+ op->o_private = o_priv;
}
if ( e ) {
a = attr_find( e->e_attrs, group_at );
struct berval bv, nbase;
Filter *filter;
Entry *user;
+ void *user_priv = NULL;
Backend *b2 = op->o_bd;
if ( target && dn_match( &target->e_nname, op_ndn ) ) {
user = target;
} else {
op->o_bd = select_backend( op_ndn, 0, 0 );
+ op->o_private = NULL;
rc = be_entry_get_rw(op, op_ndn, NULL, NULL, 0, &user );
+ user_priv = op->o_private;
+ op->o_private = o_priv;
}
if ( rc == 0 ) {
if ( rc == 0 ) break;
}
if ( user != target ) {
+ op->o_private = user_priv;
be_entry_release_r( op, user );
+ op->o_private = o_priv;
}
}
op->o_bd = b2;
rc = LDAP_NO_SUCH_ATTRIBUTE;
}
if ( e != target ) {
+ op->o_private = e_priv;
be_entry_release_r( op, e );
+ op->o_private = o_priv;
}
} else {
rc = LDAP_NO_SUCH_OBJECT;
be_orig = op->o_bd;
op->o_bd = frontendDB;
-#ifdef SLAP_OVERLAY_ACCESS
rc = frontendDB->be_group( op, target, gr_ndn,
op_ndn, group_oc, group_at );
-#else /* ! SLAP_OVERLAY_ACCESS */
- rc = fe_acl_group( op, target, gr_ndn,
- op_ndn, group_oc, group_at );
-#endif /* ! SLAP_OVERLAY_ACCESS */
op->o_bd = be_orig;
return rc;
slap_access_t access )
{
Entry *e = NULL;
+ void *o_priv = op->o_private, *e_priv = NULL;
Attribute *a = NULL;
int freeattr = 0, i, j, rc = LDAP_SUCCESS;
AccessControlState acl_state = ACL_STATE_INIT;
e = target;
} else {
+ op->o_private = NULL;
rc = be_entry_get_rw( op, edn, NULL, entry_at, 0, &e );
+ e_priv = op->o_private;
+ op->o_private = o_priv;
}
if ( e ) {
+ if ( entry_at == slap_schema.si_ad_entry || entry_at == slap_schema.si_ad_children ) {
+ assert( vals == NULL );
+
+ rc = LDAP_SUCCESS;
+ if ( op->o_conn && access > ACL_NONE &&
+ access_allowed( op, e, entry_at, NULL,
+ access, &acl_state ) == 0 )
+ {
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ }
+ goto freeit;
+ }
+
a = attr_find( e->e_attrs, entry_at );
if ( a == NULL ) {
SlapReply rs = { 0 };
}
}
freeit: if ( e != target ) {
+ op->o_private = e_priv;
be_entry_release_r( op, e );
+ op->o_private = o_priv;
}
if ( freeattr ) {
attr_free( a );
be_orig = op->o_bd;
op->o_bd = frontendDB;
-#ifdef SLAP_OVERLAY_ACCESS
rc = frontendDB->be_attribute( op, target, edn,
entry_at, vals, access );
-#else /* !SLAP_OVERLAY_ACCESS */
- rc = fe_acl_attribute( op, target, edn,
- entry_at, vals, access );
-#endif /* !SLAP_OVERLAY_ACCESS */
op->o_bd = be_orig;
return rc;
slap_mask_t *mask )
{
Entry *e = NULL;
+ void *o_priv = op->o_private, *e_priv = NULL;
int rc = LDAP_INSUFFICIENT_ACCESS;
Backend *be = op->o_bd;
e = target;
} else {
+ op->o_private = NULL;
rc = be_entry_get_rw( op, edn, NULL, entry_at, 0, &e );
+ e_priv = op->o_private;
+ op->o_private = o_priv;
}
if ( e ) {
}
}
freeit: if ( e != target ) {
+ op->o_private = e_priv;
be_entry_release_r( op, e );
+ op->o_private = o_priv;
}
if ( freeattr ) {
attr_free( a );
{
Attribute **ap;
int rc = 0;
- BackendDB *be_orig;
for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next )
/* just count them */ ;
* and the backend supports specific operational attributes,
* add them to the attribute list
*/
- if ( SLAP_OPATTRS( rs->sr_attr_flags ) || ( rs->sr_attrs &&
- ad_inlist( slap_schema.si_ad_entryDN, rs->sr_attrs ) ) )
+ if ( !( rs->sr_flags & REP_NO_ENTRYDN )
+ && ( SLAP_OPATTRS( rs->sr_attr_flags ) || ( rs->sr_attrs &&
+ ad_inlist( slap_schema.si_ad_entryDN, rs->sr_attrs ) ) ) )
{
*ap = slap_operational_entryDN( rs->sr_entry );
ap = &(*ap)->a_next;
}
- if ( SLAP_OPATTRS( rs->sr_attr_flags ) || ( rs->sr_attrs &&
- ad_inlist( slap_schema.si_ad_subschemaSubentry, rs->sr_attrs ) ) )
+ if ( !( rs->sr_flags & REP_NO_SUBSCHEMA)
+ && ( SLAP_OPATTRS( rs->sr_attr_flags ) || ( rs->sr_attrs &&
+ ad_inlist( slap_schema.si_ad_subschemaSubentry, rs->sr_attrs ) ) ) )
{
*ap = slap_operational_subschemaSubentry( op->o_bd );
ap = &(*ap)->a_next;
}
- if ( op->o_bd != NULL )
- {
+ if ( op->o_bd != NULL ) {
+ BackendDB *be_orig = op->o_bd;
+
/* Let the overlays have a chance at this */
- be_orig = op->o_bd;
op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
- if ( !be_match( op->o_bd, frontendDB ) &&
+ if ( op->o_bd != NULL && !be_match( op->o_bd, frontendDB ) &&
( SLAP_OPATTRS( rs->sr_attr_flags ) || rs->sr_attrs ) &&
- op->o_bd != NULL && op->o_bd->be_operational != NULL )
+ op->o_bd->be_operational != NULL )
{
rc = op->o_bd->be_operational( op, rs );
}
projects / openldap / blobdiff