ITS#4310 seems to affect also back-ldbm

[openldap] / servers / slapd / backover.c

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 4f5d1042f92a2cb4367dce7d72a4cbfbf7d994e6..07388ec6620b69c869dc0a9426f24a53c8704421 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-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -137,6 +137,9 @@ over_db_config(
        ca.fname = fname;
        ca.lineno = lineno;
        ca.be = be;
+       snprintf( ca.log, sizeof( ca.log ), "%s: line %d",
+                       ca.fname, ca.lineno );
+
        for (; on; on=on->on_next) {
                rc = SLAP_CONF_UNKNOWN;
                if (on->on_bi.bi_cf_ocs) {
@@ -249,7 +252,7 @@ over_access_allowed(
 {
        slap_overinfo *oi;
        slap_overinst *on;
-       BackendInfo *bi = op->o_bd->bd_info;
+       BackendInfo *bi;
        BackendDB *be = op->o_bd, db;
        int rc = SLAP_CB_CONTINUE;
 
@@ -257,7 +260,13 @@ over_access_allowed(
         * when global overlays are used... */
        assert( op->o_bd != NULL );
 
-       oi = op->o_bd->bd_info->bi_private;
+       bi = op->o_bd->bd_info;
+       /* Were we invoked on the frontend? */
+       if ( !bi->bi_access_allowed ) {
+               oi = frontendDB->bd_info->bi_private;
+       } else {
+               oi = op->o_bd->bd_info->bi_private;
+       }
        on = oi->oi_list;
 
        for ( ; on; on = on->on_next ) {
@@ -707,6 +716,69 @@ overlay_register(
        slap_overinst *on
 )
 {
+       slap_overinst   *tmp;
+
+       /* FIXME: check for duplicates? */
+       for ( tmp = overlays; tmp != NULL; tmp = tmp->on_next ) {
+               if ( strcmp( on->on_bi.bi_type, tmp->on_bi.bi_type ) == 0 ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "overlay_register(\"%s\"): "
+                               "name already in use.\n",
+                               on->on_bi.bi_type, 0, 0 );
+                       return -1;
+               }
+
+               if ( on->on_bi.bi_obsolete_names != NULL ) {
+                       int     i;
+
+                       for ( i = 0; on->on_bi.bi_obsolete_names[ i ] != NULL; i++ ) {
+                               if ( strcmp( on->on_bi.bi_obsolete_names[ i ], tmp->on_bi.bi_type ) == 0 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "overlay_register(\"%s\"): "
+                                               "obsolete name \"%s\" already in use "
+                                               "by overlay \"%s\".\n",
+                                               on->on_bi.bi_type,
+                                               on->on_bi.bi_obsolete_names[ i ],
+                                               tmp->on_bi.bi_type );
+                                       return -1;
+                               }
+                       }
+               }
+
+               if ( tmp->on_bi.bi_obsolete_names != NULL ) {
+                       int     i;
+
+                       for ( i = 0; tmp->on_bi.bi_obsolete_names[ i ] != NULL; i++ ) {
+                               int     j;
+
+                               if ( strcmp( on->on_bi.bi_type, tmp->on_bi.bi_obsolete_names[ i ] ) == 0 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "overlay_register(\"%s\"): "
+                                               "name already in use "
+                                               "as obsolete by overlay \"%s\".\n",
+                                               on->on_bi.bi_type,
+                                               tmp->on_bi.bi_obsolete_names[ i ], 0 );
+                                       return -1;
+                               }
+
+                               if ( on->on_bi.bi_obsolete_names != NULL ) {
+                                       for ( j = 0; on->on_bi.bi_obsolete_names[ j ] != NULL; j++ ) {
+                                               if ( strcmp( on->on_bi.bi_obsolete_names[ j ], tmp->on_bi.bi_obsolete_names[ i ] ) == 0 ) {
+                                                       Debug( LDAP_DEBUG_ANY,
+                                                               "overlay_register(\"%s\"): "
+                                                               "obsolete name \"%s\" already in use "
+                                                               "as obsolete by overlay \"%s\".\n",
+                                                               on->on_bi.bi_type,
+                                                               on->on_bi.bi_obsolete_names[ j ],
+                                                               tmp->on_bi.bi_type );
+                                                       return -1;
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
+
        on->on_next = overlays;
        overlays = on;
        return 0;
@@ -714,8 +786,8 @@ overlay_register(
 
 /*
  * iterator on registered overlays; overlay_next( NULL ) returns the first
- * overlay; * subsequent calls with the previously returned value allow to 
- * iterate * over the entire list; returns NULL when no more overlays are 
+ * overlay; subsequent calls with the previously returned value allow to 
+ * iterate over the entire list; returns NULL when no more overlays are 
  * registered.
  */
 
@@ -745,10 +817,26 @@ overlay_find( const char *over_type )
 
        for ( ; on; on = on->on_next ) {
                if ( strcmp( on->on_bi.bi_type, over_type ) == 0 ) {
-                       break;
+                       goto foundit;
+               }
+
+               if ( on->on_bi.bi_obsolete_names != NULL ) {
+                       int     i;
+
+                       for ( i = 0; on->on_bi.bi_obsolete_names[ i ] != NULL; i++ ) {
+                               if ( strcmp( on->on_bi.bi_obsolete_names[ i ], over_type ) == 0 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "overlay_find(\"%s\"): "
+                                               "obsolete name for \"%s\".\n",
+                                               on->on_bi.bi_obsolete_names[ i ],
+                                               on->on_bi.bi_type, 0 );
+                                       goto foundit;
+                               }
+                       }
                }
        }
 
+foundit:;
        return on;
 }
 
@@ -795,7 +883,6 @@ overlay_is_inst( BackendDB *be, const char *over_type )
 int
 overlay_register_control( BackendDB *be, const char *oid )
 {
-       int             rc = 0;
        int             gotit = 0;
        int             cid;
 
@@ -803,7 +890,7 @@ overlay_register_control( BackendDB *be, const char *oid )
                return -1;
        }
 
-       if ( SLAP_DBFLAGS( be ) & SLAP_DBFLAG_GLOBAL_OVERLAY ) {
+       if ( SLAP_ISGLOBALOVERLAY( be ) ) {
                BackendDB *bd;
                
                /* add to all backends... */
@@ -818,12 +905,12 @@ overlay_register_control( BackendDB *be, const char *oid )
 
        }
        
-       if ( rc == 0 && !gotit ) {
+       if ( !gotit ) {
                be->be_ctrls[ cid ] = 1;
                be->be_ctrls[ SLAP_MAX_CIDS ] = 1;
        }
 
-       return rc;
+       return 0;
 }
 
 void
@@ -868,6 +955,7 @@ overlay_config( BackendDB *be, const char *ov )
                oi = ch_malloc( sizeof( slap_overinfo ) );
                oi->oi_orig = be->bd_info;
                oi->oi_bi = *be->bd_info;
+               oi->oi_origdb = be;
 
                /* NOTE: the first time a global overlay is configured,
                 * frontendDB gets this flag; it is used later by overlays