Preliminary checkin for new access_allowed() signature. Still need

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index ce69388fa17f5ada292fe2ba1d91e49e6238aabf..1c4f4e1a2346a26fe6df7af2001792ef9171278f 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2008 The OpenLDAP Foundation.
+ * Copyright 2003-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -103,6 +103,8 @@ over_db_config(
        ca.be = be;
        snprintf( ca.log, sizeof( ca.log ), "%s: line %d",
                        ca.fname, ca.lineno );
+       ca.op = SLAP_CONFIG_ADD;
+       ca.valx = -1;
 
        for (; on; on=on->on_next) {
                rc = SLAP_CONF_UNKNOWN;
@@ -193,7 +195,7 @@ over_db_destroy(
        slap_overinfo *oi = be->bd_info->bi_private;
        slap_overinst *on = oi->oi_list, *next;
        BackendInfo *bi_orig = be->bd_info;
-       int rc;
+       int rc = 0;
 
        be->bd_info = oi->oi_orig;
        if ( be->bd_info->bi_db_destroy ) {
@@ -248,12 +250,7 @@ over_back_response ( Operation *op, SlapReply *rs )
 static int
 over_access_allowed(
        Operation               *op,
-       Entry                   *e,
-       AttributeDescription    *desc,
-       struct berval           *val,
-       slap_access_t           access,
-       AccessControlState      *state,
-       slap_mask_t             *maskp )
+       AclCheck                *ak )
 {
        slap_overinfo *oi;
        slap_overinst *on;
@@ -284,8 +281,7 @@ over_access_allowed(
                        }
 
                        op->o_bd->bd_info = (BackendInfo *)on;
-                       rc = on->on_bi.bi_access_allowed( op, e,
-                               desc, val, access, state, maskp );
+                       rc = on->on_bi.bi_access_allowed( op, ak );
                        if ( rc != SLAP_CB_CONTINUE ) break;
                }
        }
@@ -305,8 +301,7 @@ over_access_allowed(
                        bi_access_allowed = slap_access_allowed;
                }
 
-               rc = bi_access_allowed( op, e,
-                       desc, val, access, state, maskp );
+               rc = bi_access_allowed( op, ak );
        }
        /* should not fall thru this far without anything happening... */
        if ( rc == SLAP_CB_CONTINUE ) {
@@ -697,7 +692,7 @@ over_op_func(
        slap_overinfo *oi;
        slap_overinst *on;
        BackendDB *be = op->o_bd, db;
-       slap_callback cb = {NULL, over_back_response, NULL, NULL};
+       slap_callback cb = {NULL, over_back_response, NULL, NULL}, **sc;
        int rc = SLAP_CB_CONTINUE;
 
        /* FIXME: used to happen for instance during abandon
@@ -717,9 +712,14 @@ over_op_func(
        op->o_callback = &cb;
 
        rc = overlay_op_walk( op, rs, which, oi, on );
+       for ( sc = &op->o_callback; *sc; sc = &(*sc)->sc_next ) {
+               if ( *sc == &cb ) {
+                       *sc = cb.sc_next;
+                       break;
+               }
+       }
 
        op->o_bd = be;
-       op->o_callback = cb.sc_next;
        return rc;
 }
 
@@ -1107,14 +1107,15 @@ void
 overlay_remove( BackendDB *be, slap_overinst *on )
 {
        slap_overinfo *oi = on->on_info;
-       slap_overinst **oidx, *on2;
+       slap_overinst **oidx;
+       BackendInfo *bi_orig;
 
        /* remove overlay from oi_list an call db_close and db_destroy
         * handlers */
        for ( oidx = &oi->oi_list; *oidx; oidx = &(*oidx)->on_next ) {
                if ( *oidx == on ) {
                        *oidx = on->on_next;
-                       BackendInfo *bi_orig = be->bd_info;
+                       bi_orig = be->bd_info;
                        be->bd_info = (BackendInfo *)on;
                        if ( on->on_bi.bi_db_close ) {
                                on->on_bi.bi_db_close( be, NULL );