sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s3-dbwrap: push lp_ctx up another layer in the stack

Browse Source 
This will allow db_open_tdb() to be called from common code, which may
already have a loadparm context loaded.

It also slowly moves the lp_ctx up the stack, as required to remove
the library loop between smbconf and the registry.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2012-04-16 13:37:39 +10:00
parent 235016bcf9
commit 338e5a1d35
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/lib/dbwrap/dbwrap_open.c
View File

@ -24,6 +24,7 @@
#include "dbwrap/dbwrap_open.h"
#include "dbwrap/dbwrap_tdb.h"
#include "dbwrap/dbwrap_ctdb.h"
#include "lib/param/param.h"
#include "util_tdb.h"
#ifdef CLUSTER_SUPPORT
#include "ctdb_private.h"
@ -117,9 +118,11 @@ struct db_context *db_open(TALLOC_CTX *mem_ctx,
#endif
if (result == NULL) {
result = db_open_tdb(mem_ctx, name, hash_size,
struct loadparm_context *lp_ctx = loadparm_init_s3(mem_ctx, loadparm_s3_context());
result = db_open_tdb(mem_ctx, lp_ctx, name, hash_size,
tdb_flags, open_flags, mode,
lock_order);
talloc_unlink(mem_ctx, lp_ctx);
}
return result;
}

5
source3/lib/dbwrap/dbwrap_tdb.c
View File

@ -22,7 +22,6 @@
#include "dbwrap/dbwrap_private.h"
#include "dbwrap/dbwrap_tdb.h"
#include "lib/tdb_wrap/tdb_wrap.h"
#include "lib/param/param.h"
#include "util_tdb.h"
struct db_tdb_ctx {
@ -363,6 +362,7 @@ static int db_tdb_transaction_cancel(struct db_context *db)
}
struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
struct loadparm_context *lp_ctx,
const char *name,
int hash_size, int tdb_flags,
int open_flags, mode_t mode,
@ -370,14 +370,12 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
{
struct db_context *result = NULL;
struct db_tdb_ctx *db_tdb;
struct loadparm_context *lp_ctx;
result = talloc_zero(mem_ctx, struct db_context);
if (result == NULL) {
DEBUG(0, ("talloc failed\n"));
goto fail;
}
lp_ctx = loadparm_init_s3(result, loadparm_s3_context());
result->private_data = db_tdb = talloc(result, struct db_tdb_ctx);
if (db_tdb == NULL) {
@ -388,7 +386,6 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
db_tdb->wtdb = tdb_wrap_open(db_tdb, name, hash_size, tdb_flags,
open_flags, mode, lp_ctx);
talloc_unlink(result, lp_ctx);
if (db_tdb->wtdb == NULL) {
DEBUG(3, ("Could not open tdb: %s\n", strerror(errno)));
goto fail;

1
source3/lib/dbwrap/dbwrap_tdb.h
View File

@ -25,6 +25,7 @@
struct db_context;
struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
struct loadparm_context *lp_ctx,
const char *name,
int hash_size, int tdb_flags,
int open_flags, mode_t mode,

5
source3/smbd/notify_internal.c
View File

@ -123,6 +123,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx,
struct messaging_context *msg,
struct event_context *ev)
{
struct loadparm_context *lp_ctx;
struct notify_context *notify;
notify = talloc(mem_ctx, struct notify_context);
@ -132,10 +133,12 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx,
notify->msg = msg;
notify->list = NULL;
lp_ctx = loadparm_init_s3(notify, loadparm_s3_context());
notify->db_notify = db_open_tdb(
notify, lock_path("notify.tdb"),
notify, lp_ctx, lock_path("notify.tdb"),
0, TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
O_RDWR|O_CREAT, 0644, DBWRAP_LOCK_ORDER_2);
talloc_unlink(notify, lp_ctx);
if (notify->db_notify == NULL) {
goto fail;
}