Add ldap_pvt_thread_pool_retract() to cancel pending threads

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index b813b9b662a1b184ff6aa11db2478ab7ff845d1b..1be6cfa3e9000e8034454bd54e9ac0a83a65832b 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 ) {
@@ -597,6 +599,27 @@ over_acl_attribute(
        return rc;
 }
 
+int
+overlay_callback_after_backover( Operation *op, slap_callback *sc, int append )
+{
+       slap_callback **scp;
+
+       for ( scp = &op->o_callback; *scp != NULL; scp = &(*scp)->sc_next ) {
+               if ( (*scp)->sc_response == over_back_response ) {
+                       sc->sc_next = (*scp)->sc_next;
+                       (*scp)->sc_next = sc;
+                       return 0;
+               }
+       }
+
+       if ( append ) {
+               *scp = sc;
+               return 0;
+       }
+
+       return 1;
+}
+
 /*
  * default return code in case of missing backend function
  * and overlay stack returning SLAP_CB_CONTINUE
@@ -1042,7 +1065,7 @@ overlay_register_control( BackendDB *be, const char *oid )
                
                /* add to all backends... */
                LDAP_STAILQ_FOREACH( bd, &backendDB, be_next ) {
-                       if ( be == bd ) {
+                       if ( bd == be->bd_self ) {
                                gotit = 1;
                        }
 
@@ -1053,8 +1076,8 @@ overlay_register_control( BackendDB *be, const char *oid )
        }
        
        if ( !gotit ) {
-               be->be_ctrls[ cid ] = 1;
-               be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
+               be->bd_self->be_ctrls[ cid ] = 1;
+               be->bd_self->be_ctrls[ SLAP_MAX_CIDS ] = 1;
        }
 
        return 0;
@@ -1081,6 +1104,44 @@ overlay_destroy_one( BackendDB *be, slap_overinst *on )
        }
 }
 
+#ifdef SLAP_CONFIG_DELETE
+void
+overlay_remove( BackendDB *be, slap_overinst *on )
+{
+       slap_overinfo *oi = on->on_info;
+       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;
+                       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 );
+                       }
+                       if ( on->on_bi.bi_db_destroy ) {
+                               on->on_bi.bi_db_destroy( be, NULL );
+                       }
+                       be->bd_info = bi_orig;
+                       free( on );
+                       break;
+               }
+       }
+       
+       /* clean up after removing last overlay */
+       if ( ! oi->oi_list ) 
+       {
+               /* reset db flags and bd_info to orig */
+               SLAP_DBFLAGS( be ) &= ~SLAP_DBFLAG_GLOBAL_OVERLAY;
+               be->bd_info = oi->oi_orig;
+               ch_free(oi);
+       }
+}
+#endif /* SLAP_CONFIG_DELETE */
+
 void
 overlay_insert( BackendDB *be, slap_overinst *on2, slap_overinst ***prev,
        int idx )