r20920: use cluster_tdb_tmp_open() in ntvfs backend code

(This used to be commit c9080c54872f107d1e42e77261df50a5d55d294f)

diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c
index 34c0b7e979f9047ab404c180234c68ae46c0d5d2..ee83008ce21f384a5ef238d11f92e9199cf8fd2b 100644 (file)
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -87,7 +87,6 @@ struct brl_handle {
 static struct brl_context *brl_tdb_init(TALLOC_CTX *mem_ctx, struct server_id server, 
                                    struct messaging_context *messaging_ctx)
 {
-       char *path;
        struct brl_context *brl;
 
        brl = talloc(mem_ctx, struct brl_context);
@@ -95,10 +94,7 @@ static struct brl_context *brl_tdb_init(TALLOC_CTX *mem_ctx, struct server_id se
                return NULL;
        }
 
-       path = smbd_tmp_path(brl, "brlock.tdb");
-       brl->w = tdb_wrap_open(brl, path, 0,
-                              TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-       talloc_free(path);
+       brl->w = cluster_tdb_tmp_open(brl, "brlock.tdb", TDB_DEFAULT);
        if (brl->w == NULL) {
                talloc_free(brl);
                return NULL;

diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index 0ee66a5a41d67737061f9d30a55f2a41d2299599..2306cfe7420522cb05ab7f72f84bde944f7d8ff8 100644 (file)
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -85,7 +85,6 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server,
                                   struct event_context *ev,
                                   struct share_config *scfg)
 {
-       char *path;
        struct notify_context *notify;
 
        if (share_bool_option(scfg, NOTIFY_ENABLE, NOTIFY_ENABLE_DEFAULT) != True) {
@@ -97,11 +96,7 @@ struct notify_context *notify_init(TALLOC_CTX *mem_ctx, struct server_id server,
                return NULL;
        }
 
-       path = smbd_tmp_path(notify, "notify.tdb");
-       notify->w = tdb_wrap_open(notify, path, 0,  
-                                 TDB_SEQNUM,
-                                 O_RDWR|O_CREAT, 0600);
-       talloc_free(path);
+       notify->w = cluster_tdb_tmp_open(notify, "notify.tdb", TDB_SEQNUM);
        if (notify->w == NULL) {
                talloc_free(notify);
                return NULL;

diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index e272ece3e5bb6a6bdae36aee14716b2c8bac5336..875f90760cd63861afab21df1575f06fa3df248d 100644 (file)
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -72,7 +72,6 @@ struct odb_lock {
 _PUBLIC_ struct odb_context *odb_init(TALLOC_CTX *mem_ctx, 
                                      struct ntvfs_context *ntvfs_ctx)
 {
-       char *path;
        struct odb_context *odb;
 
        odb = talloc(mem_ctx, struct odb_context);
@@ -80,11 +79,7 @@ _PUBLIC_ struct odb_context *odb_init(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       path = smbd_tmp_path(odb, "openfiles.tdb");
-       odb->w = tdb_wrap_open(odb, path, 0,  
-                              TDB_DEFAULT,
-                              O_RDWR|O_CREAT, 0600);
-       talloc_free(path);
+       odb->w = cluster_tdb_tmp_open(odb, "openfiles.tdb", TDB_DEFAULT);
        if (odb->w == NULL) {
                talloc_free(odb);
                return NULL;