Commit be32dce9 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

rework static backend initialization

parent 0e83717e
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
int
bdb_add(Operation *op, SlapReply *rs )
......
......@@ -22,7 +22,6 @@
#include <ac/unistd.h>
#include "back-bdb.h"
#include "external.h"
int
bdb_bind( Operation *op, SlapReply *rs )
......
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
int
bdb_compare( Operation *op, SlapReply *rs )
......
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
#ifdef DB_DIRTY_READ
# define SLAP_BDB_ALLOW_DIRTY_READ
......
......@@ -24,7 +24,6 @@
#include "lutil.h"
#include "back-bdb.h"
#include "external.h"
int
bdb_csn_commit(
......
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
int
bdb_delete( Operation *op, SlapReply *rs )
......
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
#include "lber_pvt.h"
static struct exop {
......
......@@ -16,75 +16,22 @@
#ifndef _BDB_EXTERNAL_H
#define _BDB_EXTERNAL_H
LDAP_BEGIN_DECL
#ifndef BDB_SYMBOL
#ifdef BDB_HIER
#define BDB_SYMBOL(x) LDAP_CONCAT(hdb_,x)
#else
#define BDB_SYMBOL(x) LDAP_CONCAT(bdb_,x)
#endif
#endif
#define bdb_initialize BDB_SYMBOL(initialize)
#define bdb_db_config BDB_SYMBOL(db_config)
#define bdb_add BDB_SYMBOL(add)
#define bdb_bind BDB_SYMBOL(bind)
#define bdb_compare BDB_SYMBOL(compare)
#define bdb_delete BDB_SYMBOL(delete)
#define bdb_modify BDB_SYMBOL(modify)
#define bdb_modrdn BDB_SYMBOL(modrdn)
#define bdb_search BDB_SYMBOL(search)
#define bdb_extended BDB_SYMBOL(extended)
#define bdb_referrals BDB_SYMBOL(referrals)
#define bdb_operational BDB_SYMBOL(operational)
#define bdb_hasSubordinates BDB_SYMBOL(hasSubordinates)
#define bdb_tool_entry_open BDB_SYMBOL(tool_entry_open)
#define bdb_tool_entry_close BDB_SYMBOL(tool_entry_close)
#define bdb_tool_entry_next BDB_SYMBOL(tool_entry_next)
#define bdb_tool_entry_get BDB_SYMBOL(tool_entry_get)
#define bdb_tool_entry_put BDB_SYMBOL(tool_entry_put)
#define bdb_tool_entry_reindex BDB_SYMBOL(tool_entry_reindex)
#define bdb_tool_dn2id_get BDB_SYMBOL(tool_dn2id_get)
#define bdb_tool_id2entry_get BDB_SYMBOL(tool_id2entry_get)
#define bdb_tool_entry_modify BDB_SYMBOL(tool_entry_modify)
extern BI_init bdb_initialize;
extern BI_db_config bdb_db_config;
extern BI_op_add bdb_add;
extern BI_op_bind bdb_bind;
#ifndef _PROTO_BDB_H
#error "\"proto-bdb.h\" must be included first"
#endif /* _PROTO_BDB_H */
extern BI_op_compare bdb_compare;
/*
extern BI_op_delete bdb_delete;
#include "proto-bdb.h"
extern BI_op_modify bdb_modify;
extern BI_op_modrdn bdb_modrdn;
extern BI_op_search bdb_search;
extern BI_op_extended bdb_extended;
extern BI_chk_referrals bdb_referrals;
* must be included first
*/
extern BI_operational bdb_operational;
LDAP_BEGIN_DECL
extern BI_has_subordinates bdb_hasSubordinates;
#define bdb_back_initialize BDB_SYMBOL(back_initialize)
/* tools.c */
extern BI_tool_entry_open bdb_tool_entry_open;
extern BI_tool_entry_close bdb_tool_entry_close;
extern BI_tool_entry_next bdb_tool_entry_next;
extern BI_tool_entry_get bdb_tool_entry_get;
extern BI_tool_entry_put bdb_tool_entry_put;
extern BI_tool_entry_reindex bdb_tool_entry_reindex;
extern BI_tool_dn2id_get bdb_tool_dn2id_get;
extern BI_tool_id2entry_get bdb_tool_id2entry_get;
extern BI_tool_entry_modify bdb_tool_entry_modify;
extern BI_init bdb_back_initialize;
LDAP_END_DECL
......
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
static int bdb_id2entry_put(
BackendDB *be,
......
......@@ -540,7 +540,7 @@ int init_module( int argc, char *argv[] ) {
#else
bi.bi_type = "bdb";
#endif
bi.bi_init = bdb_initialize;
bi.bi_init = bdb_back_initialize;
backend_add( &bi );
return 0;
......@@ -548,7 +548,7 @@ int init_module( int argc, char *argv[] ) {
#endif /* SLAPD_BDB */
int
bdb_initialize(
bdb_back_initialize(
BackendInfo *bi )
{
static char *controls[] = {
......@@ -564,7 +564,7 @@ bdb_initialize(
};
/* initialize the underlying database system */
Debug( LDAP_DEBUG_TRACE, "bdb_initialize: initialize BDB backend\n",
Debug( LDAP_DEBUG_TRACE, "bdb_back_initialize: initialize BDB backend\n",
0, 0, 0 );
bi->bi_flags |=
......@@ -596,12 +596,12 @@ bdb_initialize(
if( ver < DB_VERSION_FULL )
{
Debug( LDAP_DEBUG_ANY,
"bdb_initialize: BDB library version mismatch:"
"bdb_back_initialize: BDB library version mismatch:"
" expected " DB_VERSION_STRING ","
" got %s\n", version, 0, 0 );
}
Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n",
Debug( LDAP_DEBUG_ANY, "bdb_back_initialize: %s\n",
version, 0, 0 );
}
......
......@@ -21,7 +21,6 @@
#include <ac/time.h>
#include "back-bdb.h"
#include "external.h"
static struct berval scbva[] = {
BER_BVC("glue"),
......
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
int
bdb_modrdn( Operation *op, SlapReply *rs )
......
......@@ -23,7 +23,6 @@
#include "slap.h"
#include "back-bdb.h"
#include "external.h"
/*
* sets *hasSubordinates to LDAP_COMPARE_TRUE/LDAP_COMPARE_FALSE
......
......@@ -572,6 +572,68 @@ int bdb_do_search(
void
bdb_trans_backoff( int num_retries );
/*
* former external.h
*/
#ifndef BDB_SYMBOL
#ifdef BDB_HIER
#define BDB_SYMBOL(x) LDAP_CONCAT(hdb_,x)
#else
#define BDB_SYMBOL(x) LDAP_CONCAT(bdb_,x)
#endif
#endif
#define bdb_db_config BDB_SYMBOL(db_config)
#define bdb_add BDB_SYMBOL(add)
#define bdb_bind BDB_SYMBOL(bind)
#define bdb_compare BDB_SYMBOL(compare)
#define bdb_delete BDB_SYMBOL(delete)
#define bdb_modify BDB_SYMBOL(modify)
#define bdb_modrdn BDB_SYMBOL(modrdn)
#define bdb_search BDB_SYMBOL(search)
#define bdb_extended BDB_SYMBOL(extended)
#define bdb_referrals BDB_SYMBOL(referrals)
#define bdb_operational BDB_SYMBOL(operational)
#define bdb_hasSubordinates BDB_SYMBOL(hasSubordinates)
#define bdb_tool_entry_open BDB_SYMBOL(tool_entry_open)
#define bdb_tool_entry_close BDB_SYMBOL(tool_entry_close)
#define bdb_tool_entry_next BDB_SYMBOL(tool_entry_next)
#define bdb_tool_entry_get BDB_SYMBOL(tool_entry_get)
#define bdb_tool_entry_put BDB_SYMBOL(tool_entry_put)
#define bdb_tool_entry_reindex BDB_SYMBOL(tool_entry_reindex)
#define bdb_tool_dn2id_get BDB_SYMBOL(tool_dn2id_get)
#define bdb_tool_id2entry_get BDB_SYMBOL(tool_id2entry_get)
#define bdb_tool_entry_modify BDB_SYMBOL(tool_entry_modify)
extern BI_db_config bdb_db_config;
extern BI_op_add bdb_add;
extern BI_op_bind bdb_bind;
extern BI_op_compare bdb_compare;
extern BI_op_delete bdb_delete;
extern BI_op_modify bdb_modify;
extern BI_op_modrdn bdb_modrdn;
extern BI_op_search bdb_search;
extern BI_op_extended bdb_extended;
extern BI_chk_referrals bdb_referrals;
extern BI_operational bdb_operational;
extern BI_has_subordinates bdb_hasSubordinates;
/* tools.c */
extern BI_tool_entry_open bdb_tool_entry_open;
extern BI_tool_entry_close bdb_tool_entry_close;
extern BI_tool_entry_next bdb_tool_entry_next;
extern BI_tool_entry_get bdb_tool_entry_get;
extern BI_tool_entry_put bdb_tool_entry_put;
extern BI_tool_entry_reindex bdb_tool_entry_reindex;
extern BI_tool_dn2id_get bdb_tool_dn2id_get;
extern BI_tool_id2entry_get bdb_tool_id2entry_get;
extern BI_tool_entry_modify bdb_tool_entry_modify;
LDAP_END_DECL
#endif /* _PROTO_BDB_H */
......@@ -19,7 +19,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
int
bdb_referrals( Operation *op, SlapReply *rs )
......
......@@ -21,7 +21,6 @@
#include "back-bdb.h"
#include "idl.h"
#include "external.h"
static int base_candidate(
BackendDB *be,
......
......@@ -21,7 +21,6 @@
#define AVL_INTERNAL
#include "back-bdb.h"
#include "external.h"
static DBC *cursor = NULL;
static DBT key, data;
......
......@@ -20,7 +20,6 @@
#include <ac/string.h>
#include "back-bdb.h"
#include "external.h"
#include "lber_pvt.h"
#include "lutil.h"
......
......@@ -28,7 +28,7 @@
#include <ac/string.h>
#include "slap.h"
#include "external.h"
#include "proto-dnssrv.h"
int
dnssrv_back_bind(
......
......@@ -27,7 +27,7 @@
#include <ac/socket.h>
#include "slap.h"
#include "back-dnssrv.h"
#include "proto-dnssrv.h"
int
dnssrv_back_compare(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment