diff options
author | Michael Adam <obnox@samba.org> | 2011-07-06 16:40:21 +0200 |
---|---|---|
committer | Michael Adam <obnox@samba.org> | 2011-07-29 12:23:13 +0200 |
commit | 1abdd9b2bb09d072496db5207814aefefe403f60 (patch) | |
tree | 19f220caaecca300aee085e215846983823f8900 /source3/lib/dbwrap.c | |
parent | 75c7320497dc53d23bced5472faef7d9c31c1d9b (diff) | |
download | samba-1abdd9b2bb09d072496db5207814aefefe403f60.tar.gz samba-1abdd9b2bb09d072496db5207814aefefe403f60.tar.bz2 samba-1abdd9b2bb09d072496db5207814aefefe403f60.zip |
s3:dbwrap: move db_open() to a file dbwrap_open.c of its own.
Also start new folder lib/dbwrap/ where dbwrap_open.c is stored and
make the fallbacke implementation functoins non-static and create a
dbwrap_private.h header file that contains their prototypes.
Diffstat (limited to 'source3/lib/dbwrap.c')
-rw-r--r-- | source3/lib/dbwrap.c | 81 |
1 files changed, 10 insertions, 71 deletions
diff --git a/source3/lib/dbwrap.c b/source3/lib/dbwrap.c index 83fc40efac..0774974ced 100644 --- a/source3/lib/dbwrap.c +++ b/source3/lib/dbwrap.c @@ -21,16 +21,19 @@ #include "includes.h" #include "dbwrap.h" +#include "dbwrap/dbwrap_private.h" #include "util_tdb.h" #ifdef CLUSTER_SUPPORT #include "ctdb_private.h" #endif + + /* * Fall back using fetch_locked if no genuine fetch operation is provided */ -static int dbwrap_fallback_fetch(struct db_context *db, TALLOC_CTX *mem_ctx, - TDB_DATA key, TDB_DATA *data) +int dbwrap_fallback_fetch(struct db_context *db, TALLOC_CTX *mem_ctx, + TDB_DATA key, TDB_DATA *data) { struct db_record *rec; @@ -48,11 +51,11 @@ static int dbwrap_fallback_fetch(struct db_context *db, TALLOC_CTX *mem_ctx, * Fall back using fetch if no genuine parse operation is provided */ -static int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key, - int (*parser)(TDB_DATA key, - TDB_DATA data, - void *private_data), - void *private_data) +int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key, + int (*parser)(TDB_DATA key, + TDB_DATA data, + void *private_data), + void *private_data) { TDB_DATA data; int res; @@ -93,67 +96,3 @@ bool db_is_local(const char *name) #endif return true; } - -/** - * open a database - */ -struct db_context *db_open(TALLOC_CTX *mem_ctx, - const char *name, - int hash_size, int tdb_flags, - int open_flags, mode_t mode) -{ - struct db_context *result = NULL; -#ifdef CLUSTER_SUPPORT - const char *sockname = lp_ctdbd_socket(); - - if(!sockname || !*sockname) { - sockname = CTDB_PATH; - } - - if (lp_clustering()) { - const char *partname; - - if (!socket_exist(sockname)) { - DEBUG(1, ("ctdb socket does not exist - is ctdb not " - "running?\n")); - return NULL; - } - - /* ctdb only wants the file part of the name */ - partname = strrchr(name, '/'); - if (partname) { - partname++; - } else { - partname = name; - } - /* allow ctdb for individual databases to be disabled */ - if (lp_parm_bool(-1, "ctdb", partname, True)) { - result = db_open_ctdb(mem_ctx, partname, hash_size, - tdb_flags, open_flags, mode); - if (result == NULL) { - DEBUG(0,("failed to attach to ctdb %s\n", - partname)); - if (errno == 0) { - errno = EIO; - } - return NULL; - } - } - } - -#endif - - if (result == NULL) { - result = db_open_tdb(mem_ctx, name, hash_size, - tdb_flags, open_flags, mode); - } - - if ((result != NULL) && (result->fetch == NULL)) { - result->fetch = dbwrap_fallback_fetch; - } - if ((result != NULL) && (result->parse_record == NULL)) { - result->parse_record = dbwrap_fallback_parse_record; - } - - return result; -} |