tdb_wrap: Remove tdb_wrap_open_ again

[kai/samba-autobuild/.git] / source4 / ntvfs / posix / vfs_posix.c

diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 2ca024b6187e8dc23f0a8da9cb65deec6f332533..304a9ff8fe58063c12c69c93079fac417dd28fb9 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -38,7 +38,8 @@
 static void pvfs_setup_options(struct pvfs_state *pvfs)
 {
        struct share_config *scfg = pvfs->ntvfs->ctx->config;
-       const char *eadb;
+       char *eadb;
+       char *xattr_backend;
        bool def_perm_override = false;
 
        if (share_bool_option(scfg, SHARE_MAP_HIDDEN, SHARE_MAP_HIDDEN_DEFAULT))
@@ -117,11 +118,13 @@ static void pvfs_setup_options(struct pvfs_state *pvfs)
                FS_ATTR_SPARSE_FILES;
 
        /* allow xattrs to be stored in a external tdb */
-       eadb = share_string_option(scfg, PVFS_EADB, NULL);
+       eadb = share_string_option(pvfs, scfg, PVFS_EADB, NULL);
        if (eadb != NULL) {
-               pvfs->ea_db = tdb_wrap_open(pvfs, eadb, 50000,  
-                                           TDB_DEFAULT, O_RDWR|O_CREAT, 0600, 
-                                           pvfs->ntvfs->ctx->lp_ctx);
+               pvfs->ea_db = tdb_wrap_open(
+                       pvfs, eadb, 50000,
+                       lpcfg_tdb_flags(pvfs->ntvfs->ctx->lp_ctx, TDB_DEFAULT),
+                       O_RDWR|O_CREAT, 0600);
+               TALLOC_FREE(eadb);
                if (pvfs->ea_db != NULL) {
                        pvfs->flags |= PVFS_FLAG_XATTR_ENABLE;
                } else {
@@ -147,7 +150,9 @@ static void pvfs_setup_options(struct pvfs_state *pvfs)
        }
 
        /* enable an ACL backend */
-       pvfs->acl_ops = pvfs_acl_backend_byname(share_string_option(scfg, PVFS_ACL, "xattr"));
+       xattr_backend = share_string_option(pvfs, scfg, PVFS_ACL, "xattr");
+       pvfs->acl_ops = pvfs_acl_backend_byname(xattr_backend);
+       TALLOC_FREE(xattr_backend);
 }
 
 static int pvfs_state_destructor(struct pvfs_state *pvfs)
@@ -220,7 +225,7 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
        NT_STATUS_HAVE_NO_MEMORY(pvfs);
 
        /* for simplicity of path construction, remove any trailing slash now */
-       base_directory = talloc_strdup(pvfs, share_string_option(ntvfs->ctx->config, SHARE_PATH, ""));
+       base_directory = share_string_option(pvfs, ntvfs->ctx->config, SHARE_PATH, "");
        NT_STATUS_HAVE_NO_MEMORY(base_directory);
        if (strcmp(base_directory, "/") != 0) {
                trim_string(base_directory, NULL, "/");
@@ -271,13 +276,6 @@ static NTSTATUS pvfs_connect(struct ntvfs_module_context *ntvfs,
                                           pvfs->ntvfs->ctx->event_ctx,
                                           pvfs->ntvfs->ctx->config);
 
-       pvfs->wbc_ctx = wbc_init(pvfs,
-                                pvfs->ntvfs->ctx->msg_ctx,
-                                pvfs->ntvfs->ctx->event_ctx);
-       if (pvfs->wbc_ctx == NULL) {
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       }
-
        /* allocate the search handle -> ptr tree */
        pvfs->search.idtree = idr_init(pvfs);
        NT_STATUS_HAVE_NO_MEMORY(pvfs->search.idtree);