sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

dbwrap: add a dbwrap_flags argument to db_open_tdb()

Browse Source 
...for consistency and in preparation of future flags
that the tdb backend might be aware of.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Michael Adam 2014-01-28 12:33:42 +01:00 committed by Stefan Metzmacher
parent 906abe55cb
commit bbf0903d6b
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dbwrap/dbwrap_local_open.c
View File

@ -103,7 +103,7 @@ static bool tdb_to_ntdb(TALLOC_CTX *ctx, struct loadparm_context *lp_ctx,
return false;
}
tdb = db_open_tdb(ctx, lp_ctx, tdbname, 0,
TDB_DEFAULT, O_RDONLY, 0, 0);
TDB_DEFAULT, O_RDONLY, 0, 0, DBWRAP_FLAG_NONE);
if (!tdb) {
DEBUG(0, ("tdb_to_ntdb: could not open %s: %s\n",
tdbname, strerror(errno)));
@ -213,7 +213,7 @@ struct db_context *dbwrap_local_open(TALLOC_CTX *mem_ctx,
}
db = db_open_tdb(mem_ctx, lp_ctx, tdbname, hash_size,
tdb_flags, open_flags, mode,
lock_order);
lock_order, dbwrap_flags);
}
out:
talloc_free(tmp_ctx);

3
lib/dbwrap/dbwrap_tdb.c
View File

@ -401,7 +401,8 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
const char *name,
int hash_size, int tdb_flags,
int open_flags, mode_t mode,
enum dbwrap_lock_order lock_order)
enum dbwrap_lock_order lock_order,
uint64_t dbrwap_flags)
{
struct db_context *result = NULL;
struct db_tdb_ctx *db_tdb;

3
lib/dbwrap/dbwrap_tdb.h
View File

@ -29,7 +29,8 @@ struct db_context *db_open_tdb(TALLOC_CTX *mem_ctx,
const char *name,
int hash_size, int tdb_flags,
int open_flags, mode_t mode,
enum dbwrap_lock_order lock_order);
enum dbwrap_lock_order lock_order,
uint64_t dbwrap_flags);
#endif /* __DBWRAP_TDB_H__ */

2
source3/smbd/notify_internal.c
View File

@ -137,7 +137,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx,
notify->db_notify = db_open_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);
O_RDWR|O_CREAT, 0644, DBWRAP_LOCK_ORDER_2, DBWRAP_FLAG_NONE);
talloc_unlink(notify, lp_ctx);
if (notify->db_notify == NULL) {
goto fail;

6
source4/ntvfs/posix/python/pyxattr_tdb.c
View File

@ -57,7 +57,8 @@ static PyObject *py_wrap_setxattr(PyObject *self, PyObject *args)
blob.length = blobsize;
mem_ctx = talloc_new(NULL);
eadb = db_open_tdb(mem_ctx, py_default_loadparm_context(mem_ctx), tdbname, 50000,
TDB_DEFAULT, O_RDWR|O_CREAT, 0600, DBWRAP_LOCK_ORDER_2);
TDB_DEFAULT, O_RDWR|O_CREAT, 0600, DBWRAP_LOCK_ORDER_2,
DBWRAP_FLAG_NONE);
if (eadb == NULL) {
PyErr_SetFromErrno(PyExc_IOError);
@ -104,7 +105,8 @@ static PyObject *py_wrap_getxattr(PyObject *self, PyObject *args)
mem_ctx = talloc_new(NULL);
eadb = db_open_tdb(mem_ctx, py_default_loadparm_context(mem_ctx), tdbname, 50000,
TDB_DEFAULT, O_RDWR|O_CREAT, 0600, DBWRAP_LOCK_ORDER_2);
TDB_DEFAULT, O_RDWR|O_CREAT, 0600, DBWRAP_LOCK_ORDER_2,
DBWRAP_FLAG_NONE);
if (eadb == NULL) {
PyErr_SetFromErrno(PyExc_IOError);