]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/backover.c
remove cruft
[openldap] / servers / slapd / backover.c
index 90c395a40f5fab6241c95a5b96b0ec98f3cc6327..8260f29a6d863e9fd1eecd9bb3115824d8decf95 100644 (file)
 
 static slap_overinst *overlays;
 
-enum db_which { db_open = 0, db_close, db_destroy };
+enum db_which {
+       db_open = 0,
+       db_close,
+       db_destroy,
+       db_last
+};
 
 static int
 over_db_func(
@@ -74,7 +79,6 @@ over_db_config(
        BackendInfo *bi_orig = be->bd_info;
        struct ConfigOCs *be_cf_ocs = be->be_cf_ocs;
        ConfigArgs ca = {0};
-       ConfigTable *ct;
        int rc = 0;
 
        if ( oi->oi_orig->bi_db_config ) {
@@ -299,31 +303,149 @@ over_access_allowed(
 
        return rc;
 }
-#endif /* SLAP_OVERLAY_ACCESS */
 
-enum op_which {
-       op_bind = 0,
-       op_unbind,
-       op_search,
-       op_compare,
-       op_modify,
-       op_modrdn,
-       op_add,
-       op_delete,
-       op_abandon,
-       op_cancel,
-       op_extended,
-       op_aux_operational,
-       op_aux_chk_referrals,
-       op_aux_chk_controls,
-       op_last
-};
+static int
+over_acl_group(
+       Operation               *op,
+       Entry                   *e,
+       struct berval           *gr_ndn,
+       struct berval           *op_ndn,
+       ObjectClass             *group_oc,
+       AttributeDescription    *group_at )
+{
+       slap_overinfo *oi;
+       slap_overinst *on;
+       BackendInfo *bi = op->o_bd->bd_info;
+       BackendDB *be = op->o_bd, db;
+       int rc = SLAP_CB_CONTINUE;
+
+       /* FIXME: used to happen for instance during abandon
+        * when global overlays are used... */
+       assert( op->o_bd != NULL );
+
+       oi = op->o_bd->bd_info->bi_private;
+       on = oi->oi_list;
+
+       for ( ; on; on = on->on_next ) {
+               if ( on->on_bi.bi_acl_group ) {
+                       /* NOTE: do not copy the structure until required */
+                       if ( !SLAP_ISOVERLAY( op->o_bd ) ) {
+                               db = *op->o_bd;
+                               db.be_flags |= SLAP_DBFLAG_OVERLAY;
+                               op->o_bd = &db;
+                       }
+
+                       op->o_bd->bd_info = (BackendInfo *)on;
+                       rc = on->on_bi.bi_acl_group( op, e,
+                               gr_ndn, op_ndn, group_oc, group_at );
+                       if ( rc != SLAP_CB_CONTINUE ) break;
+               }
+       }
+
+       if ( rc == SLAP_CB_CONTINUE ) {
+               BI_acl_group            *bi_acl_group;
+
+               /* if the database structure was changed, o_bd points to a
+                * copy of the structure; put the original bd_info in place */
+               if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+                       op->o_bd->bd_info = oi->oi_orig;
+               }
+
+               if ( oi->oi_orig->bi_acl_group ) {
+                       bi_acl_group = oi->oi_orig->bi_acl_group;
+               } else {
+                       bi_acl_group = backend_group;
+               }
+
+               rc = bi_acl_group( op, e,
+                       gr_ndn, op_ndn, group_oc, group_at );
+       }
+       /* should not fall thru this far without anything happening... */
+       if ( rc == SLAP_CB_CONTINUE ) {
+               /* access not allowed */
+               rc = 0;
+       }
+
+       op->o_bd = be;
+       op->o_bd->bd_info = bi;
+
+       return rc;
+}
+
+static int
+over_acl_attribute(
+       Operation               *op,
+       Entry                   *target,
+       struct berval           *entry_ndn,
+       AttributeDescription    *entry_at,
+       BerVarray               *vals,
+       slap_access_t           access )
+{
+       slap_overinfo *oi;
+       slap_overinst *on;
+       BackendInfo *bi = op->o_bd->bd_info;
+       BackendDB *be = op->o_bd, db;
+       int rc = SLAP_CB_CONTINUE;
+
+       /* FIXME: used to happen for instance during abandon
+        * when global overlays are used... */
+       assert( op->o_bd != NULL );
+
+       oi = op->o_bd->bd_info->bi_private;
+       on = oi->oi_list;
+
+       for ( ; on; on = on->on_next ) {
+               if ( on->on_bi.bi_acl_attribute ) {
+                       /* NOTE: do not copy the structure until required */
+                       if ( !SLAP_ISOVERLAY( op->o_bd ) ) {
+                               db = *op->o_bd;
+                               db.be_flags |= SLAP_DBFLAG_OVERLAY;
+                               op->o_bd = &db;
+                       }
+
+                       op->o_bd->bd_info = (BackendInfo *)on;
+                       rc = on->on_bi.bi_acl_attribute( op, target,
+                               entry_ndn, entry_at, vals, access );
+                       if ( rc != SLAP_CB_CONTINUE ) break;
+               }
+       }
+
+       if ( rc == SLAP_CB_CONTINUE ) {
+               BI_acl_attribute                *bi_acl_attribute;
+
+               /* if the database structure was changed, o_bd points to a
+                * copy of the structure; put the original bd_info in place */
+               if ( SLAP_ISOVERLAY( op->o_bd ) ) {
+                       op->o_bd->bd_info = oi->oi_orig;
+               }
+
+               if ( oi->oi_orig->bi_acl_attribute ) {
+                       bi_acl_attribute = oi->oi_orig->bi_acl_attribute;
+               } else {
+                       bi_acl_attribute = backend_attribute;
+               }
+
+               rc = bi_acl_attribute( op, target,
+                       entry_ndn, entry_at, vals, access );
+       }
+       /* should not fall thru this far without anything happening... */
+       if ( rc == SLAP_CB_CONTINUE ) {
+               /* access not allowed */
+               rc = 0;
+       }
+
+       op->o_bd = be;
+       op->o_bd->bd_info = bi;
+
+       return rc;
+}
+#endif /* SLAP_OVERLAY_ACCESS */
 
 /*
  * default return code in case of missing backend function
  * and overlay stack returning SLAP_CB_CONTINUE
  */
-static int op_rc[] = {
+static int op_rc[ op_last ] = {
        LDAP_UNWILLING_TO_PERFORM,      /* bind */
        LDAP_UNWILLING_TO_PERFORM,      /* unbind */
        LDAP_UNWILLING_TO_PERFORM,      /* search */
@@ -340,36 +462,17 @@ static int op_rc[] = {
        SLAP_CB_CONTINUE                /* aux_chk_controls; pass to frontend */
 };
 
-static int
-over_op_func(
+int overlay_op_walk(
        Operation *op,
        SlapReply *rs,
-       enum op_which which
+       slap_operation_t which,
+       slap_overinfo *oi,
+       slap_overinst *on
 )
 {
-       slap_overinfo *oi;
-       slap_overinst *on;
        BI_op_bind **func;
-       BackendDB *be = op->o_bd, db;
-       slap_callback cb = {NULL, over_back_response, NULL, NULL};
        int rc = SLAP_CB_CONTINUE;
 
-       /* FIXME: used to happen for instance during abandon
-        * when global overlays are used... */
-       assert( op->o_bd != NULL );
-
-       oi = op->o_bd->bd_info->bi_private;
-       on = oi->oi_list;
-
-       if ( !SLAP_ISOVERLAY( op->o_bd )) {
-               db = *op->o_bd;
-               db.be_flags |= SLAP_DBFLAG_OVERLAY;
-               op->o_bd = &db;
-       }
-       cb.sc_next = op->o_callback;
-       cb.sc_private = oi;
-       op->o_callback = &cb;
-
        for (; on; on=on->on_next ) {
                func = &on->on_bi.bi_op_bind;
                if ( func[which] ) {
@@ -394,14 +497,48 @@ over_op_func(
         */
        if ( rc == LDAP_UNWILLING_TO_PERFORM ) {
                slap_callback *sc_next;
-               for ( ; op->o_callback && op->o_callback != cb.sc_next; 
-                       op->o_callback = sc_next ) {
+               for ( ; op->o_callback && op->o_callback->sc_response !=
+                       over_back_response; op->o_callback = sc_next ) {
                        sc_next = op->o_callback->sc_next;
                        if ( op->o_callback->sc_cleanup ) {
                                op->o_callback->sc_cleanup( op, rs );
                        }
                }
        }
+       return rc;
+}
+
+static int
+over_op_func(
+       Operation *op,
+       SlapReply *rs,
+       slap_operation_t which
+)
+{
+       slap_overinfo *oi;
+       slap_overinst *on;
+       BackendDB *be = op->o_bd, db;
+       slap_callback cb = {NULL, over_back_response, NULL, NULL};
+       int rc = SLAP_CB_CONTINUE;
+
+       /* FIXME: used to happen for instance during abandon
+        * when global overlays are used... */
+       assert( op->o_bd != NULL );
+
+       oi = op->o_bd->bd_info->bi_private;
+       on = oi->oi_list;
+
+       if ( !SLAP_ISOVERLAY( op->o_bd )) {
+               db = *op->o_bd;
+               db.be_flags |= SLAP_DBFLAG_OVERLAY;
+               op->o_bd = &db;
+       }
+       cb.sc_next = op->o_callback;
+       cb.sc_private = oi;
+       op->o_callback = &cb;
+
+       rc = overlay_op_walk( op, rs, which, oi, on );
+
        op->o_bd = be;
        op->o_callback = cb.sc_next;
        return rc;
@@ -493,7 +630,8 @@ over_aux_chk_controls( Operation *op, SlapReply *rs )
 
 enum conn_which {
        conn_init = 0,
-       conn_destroy
+       conn_destroy,
+       conn_last
 };
 
 static int
@@ -601,7 +739,7 @@ overlay_find( const char *over_type )
 {
        slap_overinst *on = overlays;
 
-       assert( over_type );
+       assert( over_type != NULL );
 
        for ( ; on; on = on->on_next ) {
                if ( strcmp( on->on_bi.bi_type, over_type ) == 0 ) {
@@ -636,7 +774,7 @@ overlay_is_inst( BackendDB *be, const char *over_type )
 {
        slap_overinst   *on;
 
-       assert( be );
+       assert( be != NULL );
 
        if ( !overlay_is_over( be ) ) {
                return 0;
@@ -773,8 +911,10 @@ overlay_config( BackendDB *be, const char *ov )
                bi->bi_chk_controls = over_aux_chk_controls;
 
 #ifdef SLAP_OVERLAY_ACCESS
-               /* this has a specific arglist */
+               /* these have specific arglists */
                bi->bi_access_allowed = over_access_allowed;
+               bi->bi_acl_group = over_acl_group;
+               bi->bi_acl_attribute = over_acl_attribute;
 #endif /* SLAP_OVERLAY_ACCESS */
                
                bi->bi_connection_init = over_connection_init;