Fix ITS#3424

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 7ce420f40da2ada6bfd1aa0279e3852706d48b92..3f2bc9b766e91c61bae468fa95a80e25998da9ed 100644 (file)
--- a/servers/slapd/backover.c
+++ b/servers/slapd/backover.c
@@ -77,6 +77,48 @@ over_db_config(
                be->bd_info = oi->oi_orig;
                rc = oi->oi_orig->bi_db_config( be, fname, lineno,
                        argc, argv );
+
+               if ( be->bd_info != oi->oi_orig ) {
+                       slap_overinfo   *oi2;
+                       slap_overinst   *on2, **onp;
+                       BackendDB       be2 = *be;
+                       int             i;
+
+                       /* a database added an overlay;
+                        * work it around... */
+                       assert( overlay_is_over( be ) );
+                       
+                       oi2 = ( slap_overinfo * )be->bd_info->bi_private;
+                       on2 = oi2->oi_list;
+
+                       /* need to put a uniqueness check here as well;
+                        * note that in principle there could be more than
+                        * one overlay as a result of multiple calls to
+                        * overlay_config() */
+                       be2.bd_info = (BackendInfo *)oi;
+
+                       for ( i = 0, onp = &on2; *onp; i++, onp = &(*onp)->on_next ) {
+                               if ( overlay_is_inst( &be2, (*onp)->on_bi.bi_type ) ) {
+                                       Debug( LDAP_DEBUG_ANY, "over_db_config(): "
+                                                       "warning, freshly added "
+                                                       "overlay #%d \"%s\" is already in list\n",
+                                                       i, (*onp)->on_bi.bi_type, 0 );
+
+                                       /* NOTE: if the overlay already exists,
+                                        * there is no way to merge the results
+                                        * of the configuration that may have 
+                                        * occurred during bi_db_config(); we
+                                        * just issue a warning, and the 
+                                        * administrator should deal with this */
+                               }
+                       }
+                       *onp = oi->oi_list;
+
+                       oi->oi_list = on2;
+
+                       ch_free( be->bd_info );
+               }
+
                be->bd_info = (BackendInfo *)oi;
                if ( rc != SLAP_CONF_UNKNOWN ) return rc;
        }
@@ -106,7 +148,25 @@ over_db_close(
        BackendDB *be
 )
 {
-       return over_db_func( be, db_close );
+       slap_overinfo *oi = be->bd_info->bi_private;
+       slap_overinst *on = oi->oi_list;
+       BackendInfo *bi_orig = be->bd_info;
+       int rc = 0;
+
+       for (; on && rc == 0; on=on->on_next) {
+               be->bd_info = &on->on_bi;
+               if ( be->bd_info->bi_db_close ) {
+                       rc = be->bd_info->bi_db_close( be );
+               }
+       }
+
+       if ( oi->oi_orig->bi_db_close ) {
+               be->bd_info = oi->oi_orig;
+               rc = be->bd_info->bi_db_close( be );
+       }
+
+       be->bd_info = bi_orig;
+       return rc;
 }
 
 static int
@@ -136,6 +196,7 @@ over_back_response ( Operation *op, SlapReply *rs )
        int rc = SLAP_CB_CONTINUE;
        BackendDB *be = op->o_bd, db = *op->o_bd;
 
+       db.be_flags |= SLAP_DBFLAG_OVERLAY;
        op->o_bd = &db;
        for (; on; on=on->on_next ) {
                if ( on->on_response ) {
@@ -195,11 +256,15 @@ over_op_func(
        slap_overinfo *oi = op->o_bd->bd_info->bi_private;
        slap_overinst *on = oi->oi_list;
        BI_op_bind **func;
-       BackendDB *be = op->o_bd, db = *op->o_bd;
+       BackendDB *be = op->o_bd, db;
        slap_callback cb = {NULL, over_back_response, NULL, NULL};
        int rc = SLAP_CB_CONTINUE;
 
-       op->o_bd = &db;
+       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;
@@ -404,8 +469,8 @@ overlay_config( BackendDB *be, const char *ov )
        BackendInfo *bi = NULL;
 
        on = overlay_find( ov );
-       if (!on) {
-               Debug( LDAP_DEBUG_ANY, "overlay %s not found\n", ov, 0, 0 );
+       if ( !on ) {
+               Debug( LDAP_DEBUG_ANY, "overlay \"%s\" not found\n", ov, 0, 0 );
                return 1;
        }
 
@@ -413,13 +478,11 @@ overlay_config( BackendDB *be, const char *ov )
         * overlay info structure
         */
        if ( !overlay_is_over( be ) ) {
-               oi = ch_malloc( sizeof(slap_overinfo) );
+               oi = ch_malloc( sizeof( slap_overinfo ) );
                oi->oi_orig = be->bd_info;
                oi->oi_bi = *be->bd_info;
 
                /* Save a pointer to ourself in bi_private.
-                * This allows us to keep working in conjunction
-                * with backglue...
                 */
                oi->oi_bi.bi_private = oi;
                oi->oi_list = NULL;
@@ -457,6 +520,12 @@ overlay_config( BackendDB *be, const char *ov )
                be->bd_info = bi;
 
        } else {
+               if ( overlay_is_inst( be, ov ) ) {
+                       Debug( LDAP_DEBUG_ANY, "overlay_config(): "
+                                       "warning, overlay \"%s\" "
+                                       "already in list\n", ov, 0, 0 );
+               }
+
                oi = be->bd_info->bi_private;
        }