allow 'all' vs. 'any' sasl-authz-policy

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index bb13448a46acb76a465d4f954e32d54abe993679..46bd7a439e808a93634a997631aa1e9efe308e09 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -1,16 +1,21 @@
 /* backover.c - backend overlay routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-
-/*
- * Functions to overlay other modules over a backend.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  -- Howard Chu
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
+/* Functions to overlay other modules over a backend. */
+
 #include "portable.h"
 
 #include <stdio.h>
@@ -72,7 +77,7 @@ over_db_config(
        if ( oi->oi_bd.bd_info->bi_db_config ) {
                rc = oi->oi_bd.bd_info->bi_db_config( &oi->oi_bd, fname, lineno,
                        argc, argv );
-               if ( rc ) return rc;
+               if ( rc != SLAP_CONF_UNKNOWN ) return rc;
        }
 
        bd = *be;
@@ -81,7 +86,7 @@ over_db_config(
                if (on->on_bi.bi_db_config) {
                        rc = on->on_bi.bi_db_config( &bd, fname, lineno,
                                argc, argv );
-                       if ( rc ) break;
+                       if ( rc != SLAP_CONF_UNKNOWN ) break;
                }
        }
        return rc;
@@ -129,11 +134,8 @@ over_back_response ( Operation *op, SlapReply *rs )
        slap_overinst *on = oi->oi_list;
        int rc = SLAP_CB_CONTINUE;
        BackendDB *be = op->o_bd, db = *op->o_bd;
-       slap_callback *sc = op->o_callback->sc_private;
-       slap_callback *s0 = op->o_callback;
 
        op->o_bd = &db;
-       op->o_callback = sc;
        for (; on; on=on->on_next ) {
                if ( on->on_response ) {
                        db.bd_info = (BackendInfo *)on;
@@ -141,11 +143,7 @@ over_back_response ( Operation *op, SlapReply *rs )
                        if ( rc != SLAP_CB_CONTINUE ) break;
                }
        }
-       if ( sc && (rc == SLAP_CB_CONTINUE) ) {
-               rc = sc->sc_response( op, rs );
-       }
        op->o_bd = be;
-       op->o_callback = s0;
        return rc;
 }
 
@@ -164,11 +162,11 @@ over_op_func(
        slap_overinst *on = oi->oi_list;
        BI_op_bind **func;
        BackendDB *be = op->o_bd, db = *op->o_bd;
-       slap_callback cb = {over_back_response, NULL};
+       slap_callback cb = {NULL, over_back_response, NULL, NULL};
        int rc = SLAP_CB_CONTINUE;
 
        op->o_bd = &db;
-       cb.sc_private = op->o_callback;
+       cb.sc_next = op->o_callback;
        op->o_callback = &cb;
 
        for (; on; on=on->on_next ) {
@@ -180,6 +178,7 @@ over_op_func(
                }
        }
 
+       op->o_bd = be;
        func = &oi->oi_bd.bd_info->bi_op_bind;
        if ( func[which] && rc == SLAP_CB_CONTINUE ) {
                rc = func[which]( op, rs );
@@ -188,7 +187,7 @@ over_op_func(
        if ( rc == SLAP_CB_CONTINUE ) {
                rc = LDAP_UNWILLING_TO_PERFORM;
        }
-       op->o_bd = be;
+       op->o_callback = cb.sc_next;
        return rc;
 }