]> git.sur5r.net Git - openldap/commitdiff
don't know exactly the reason, but here without this back-hdb suddenly starts crashin...
authorPierangelo Masarati <ando@openldap.org>
Tue, 26 Sep 2006 08:43:01 +0000 (08:43 +0000)
committerPierangelo Masarati <ando@openldap.org>
Tue, 26 Sep 2006 08:43:01 +0000 (08:43 +0000)
servers/slapd/back-bdb/config.c
servers/slapd/back-bdb/monitor.c
servers/slapd/back-bdb/proto-bdb.h

index 34530f38f2f08043856ecfb80ea8001b2ca5761e..d9639fe8d9ec2c90ca70db676eef2e82297becc4 100644 (file)
@@ -31,7 +31,7 @@
 #      define  SLAP_BDB_ALLOW_DIRTY_READ
 #endif
 
-#define bdb_cf_gen                     BDB_SYMBOL(cf_gen)
+#define bdb_cf_gen             BDB_SYMBOL(cf_gen)
 #define        bdb_cf_cleanup          BDB_SYMBOL(cf_cleanup)
 #define bdb_checkpoint         BDB_SYMBOL(checkpoint)
 #define bdb_online_index       BDB_SYMBOL(online_index)
@@ -140,7 +140,7 @@ static ConfigOCs bdbocs[] = {
                "olcDbNoSync $ olcDbDirtyRead $ olcDbIDLcacheSize $ "
                "olcDbIndex $ olcDbLinearIndex $ olcDbLockDetect $ "
                "olcDbMode $ olcDbSearchStack $ olcDbShmKey $ "
-               " olcDbCacheFree ) )",
+               "olcDbCacheFree ) )",
                        Cft_Database, bdbcfg },
        { NULL, 0, NULL }
 };
@@ -333,7 +333,7 @@ bdb_cf_cleanup( ConfigArgs *c )
 }
 
 static int
-bdb_cf_gen(ConfigArgs *c)
+bdb_cf_gen( ConfigArgs *c )
 {
        struct bdb_info *bdb = c->be->be_private;
        int rc;
@@ -342,7 +342,7 @@ bdb_cf_gen(ConfigArgs *c)
                rc = 0;
                switch( c->type ) {
                case BDB_CHKPT:
-                       if (bdb->bi_txn_cp ) {
+                       if ( bdb->bi_txn_cp ) {
                                char buf[64];
                                struct berval bv;
                                bv.bv_len = sprintf( buf, "%d %d", bdb->bi_txn_cp_kbyte,
@@ -363,8 +363,10 @@ bdb_cf_gen(ConfigArgs *c)
                        break;
 
                case BDB_CONFIG:
-                       if (( slapMode&SLAP_SERVER_MODE ) && !( bdb->bi_flags&BDB_IS_OPEN )
-                               && !bdb->bi_db_config ) {
+                       if ( ( slapMode & SLAP_SERVER_MODE )
+                               && !( bdb->bi_flags & BDB_IS_OPEN )
+                               && !bdb->bi_db_config )
+                       {
                                char    buf[SLAP_TEXT_BUFLEN];
                                FILE *f = fopen( bdb->bi_db_config_path, "r" );
                                struct berval bv;
@@ -442,7 +444,7 @@ bdb_cf_gen(ConfigArgs *c)
                        if ( bdb->bi_txn_cp_task ) {
                                struct re_s *re = bdb->bi_txn_cp_task;
                                bdb->bi_txn_cp_task = NULL;
-                               if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ))
+                               if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) )
                                        ldap_pvt_runqueue_stoptask( &slapd_rq, re );
                                ldap_pvt_runqueue_remove( &slapd_rq, re );
                        }
index 63be159702bcfc9f362d168bb7e5b2e62240ffc7..fd8d308362a96796350ea5a76af813c1f227ab22 100644 (file)
@@ -198,6 +198,8 @@ bdb_monitor_free(
        return SLAP_CB_CONTINUE;
 }
 
+#define        bdb_monitor_initialize  BDB_SYMBOL(monitor_initialize)
+
 /*
  * call from within bdb_initialize()
  */
index 62b350e3f214a0a54533a69714ace239d536eb57..cffda2426e210a9e532f3f3e917c74f52cca1642 100644 (file)
@@ -429,6 +429,12 @@ int bdb_modify_internal(
 /*
  * monitor.c
  */
+
+#define bdb_monitor_db_init    BDB_SYMBOL(monitor_db_init)
+#define bdb_monitor_db_open    BDB_SYMBOL(monitor_db_open)
+#define bdb_monitor_db_close   BDB_SYMBOL(monitor_db_close)
+#define bdb_monitor_db_destroy BDB_SYMBOL(monitor_db_destroy)
+
 int bdb_monitor_db_init( BackendDB *be );
 int bdb_monitor_db_open( BackendDB *be );
 int bdb_monitor_db_close( BackendDB *be );