lib: modules: Change XXX_init interface from XXX_init(void) to XXX_init(TALLOC_CTX *)
[kai/samba-autobuild/.git] / source3 / modules / vfs_xattr_tdb.c
index 40ccf06dd951e39943872e8a775b8579017b5baa..12ccbca59200671fa583ab055ebc807f3b76a2c0 100644 (file)
@@ -2,6 +2,7 @@
  * Store posix-level xattrs in a tdb
  *
  * Copyright (C) Volker Lendecke, 2007
+ * Copyright (C) Andrew Bartlett, 2012
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "includes.h"
 #include "system/filesys.h"
 #include "smbd/smbd.h"
-#include "librpc/gen_ndr/xattr.h"
-#include "librpc/gen_ndr/ndr_xattr.h"
-#include "../librpc/gen_ndr/ndr_netlogon.h"
-#include "dbwrap.h"
-#include "util_tdb.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "source3/lib/xattr_tdb.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
-/*
- * unmarshall tdb_xattrs
- */
+static bool xattr_tdb_init(int snum, TALLOC_CTX *mem_ctx, struct db_context **p_db);
 
-static NTSTATUS xattr_tdb_pull_attrs(TALLOC_CTX *mem_ctx,
-                                    const TDB_DATA *data,
-                                    struct tdb_xattrs **presult)
+static int xattr_tdb_get_file_id(struct vfs_handle_struct *handle,
+                               const char *path, struct file_id *id)
 {
-       DATA_BLOB blob;
-       enum ndr_err_code ndr_err;
-       struct tdb_xattrs *result;
-
-       if (!(result = talloc_zero(mem_ctx, struct tdb_xattrs))) {
-               return NT_STATUS_NO_MEMORY;
-       }
+       int ret;
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct smb_filename *smb_fname;
 
-       if (data->dsize == 0) {
-               *presult = result;
-               return NT_STATUS_OK;
+       smb_fname = synthetic_smb_fname(frame, path, NULL, NULL, 0);
+       if (smb_fname == NULL) {
+               TALLOC_FREE(frame);
+               errno = ENOMEM;
+               return -1;
        }
 
-       blob = data_blob_const(data->dptr, data->dsize);
-
-       ndr_err = ndr_pull_struct_blob(&blob, result, result,
-               (ndr_pull_flags_fn_t)ndr_pull_tdb_xattrs);
+       ret = SMB_VFS_NEXT_STAT(handle, smb_fname);
 
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DEBUG(0, ("ndr_pull_tdb_xattrs failed: %s\n",
-                         ndr_errstr(ndr_err)));
-               TALLOC_FREE(result);
-               return ndr_map_error2ntstatus(ndr_err);
+       if (ret == -1) {
+               TALLOC_FREE(frame); 
+               return -1;
        }
 
-       *presult = result;
-       return NT_STATUS_OK;
+       *id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &smb_fname->st);
+       TALLOC_FREE(frame);
+       return 0;
 }
 
-/*
- * marshall tdb_xattrs
- */
-
-static NTSTATUS xattr_tdb_push_attrs(TALLOC_CTX *mem_ctx,
-                                    const struct tdb_xattrs *attribs,
-                                    TDB_DATA *data)
+static ssize_t xattr_tdb_getxattr(struct vfs_handle_struct *handle,
+                                 const char *path, const char *name,
+                                 void *value, size_t size)
 {
+       struct file_id id;
+       struct db_context *db;
+       ssize_t xattr_size;
+       int ret;
        DATA_BLOB blob;
-       enum ndr_err_code ndr_err;
-
-       ndr_err = ndr_push_struct_blob(&blob, mem_ctx, attribs,
-               (ndr_push_flags_fn_t)ndr_push_tdb_xattrs);
-
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DEBUG(0, ("ndr_push_tdb_xattrs failed: %s\n",
-                         ndr_errstr(ndr_err)));
-               return ndr_map_error2ntstatus(ndr_err);
-       }
-
-       *data = make_tdb_data(blob.data, blob.length);
-       return NT_STATUS_OK;
-}
-
-/*
- * Load tdb_xattrs for a file from the tdb
- */
-
-static NTSTATUS xattr_tdb_load_attrs(TALLOC_CTX *mem_ctx,
-                                    struct db_context *db_ctx,
-                                    const struct file_id *id,
-                                    struct tdb_xattrs **presult)
-{
-       uint8 id_buf[16];
-       NTSTATUS status;
-       TDB_DATA data;
-
-       /* For backwards compatibility only store the dev/inode. */
-       push_file_id_16((char *)id_buf, id);
-
-       if (db_ctx->fetch(db_ctx, mem_ctx,
-                         make_tdb_data(id_buf, sizeof(id_buf)),
-                         &data) != 0) {
-               return NT_STATUS_INTERNAL_DB_CORRUPTION;
-       }
-
-       status = xattr_tdb_pull_attrs(mem_ctx, &data, presult);
-       TALLOC_FREE(data.dptr);
-       return status;
-}
-
-/*
- * fetch_lock the tdb_ea record for a file
- */
-
-static struct db_record *xattr_tdb_lock_attrs(TALLOC_CTX *mem_ctx,
-                                             struct db_context *db_ctx,
-                                             const struct file_id *id)
-{
-       uint8 id_buf[16];
-
-       /* For backwards compatibility only store the dev/inode. */
-       push_file_id_16((char *)id_buf, id);
-       return db_ctx->fetch_locked(db_ctx, mem_ctx,
-                                   make_tdb_data(id_buf, sizeof(id_buf)));
-}
-
-/*
- * Save tdb_xattrs to a previously fetch_locked record
- */
-
-static NTSTATUS xattr_tdb_save_attrs(struct db_record *rec,
-                                    const struct tdb_xattrs *attribs)
-{
-       TDB_DATA data = tdb_null;
-       NTSTATUS status;
-
-       status = xattr_tdb_push_attrs(talloc_tos(), attribs, &data);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(0, ("xattr_tdb_push_attrs failed: %s\n",
-                         nt_errstr(status)));
-               return status;
-       }
-
-       status = rec->store(rec, data, 0);
-
-       TALLOC_FREE(data.dptr);
-
-       return status;
-}
-
-/*
- * Worker routine for getxattr and fgetxattr
- */
-
-static ssize_t xattr_tdb_getattr(struct db_context *db_ctx,
-                                const struct file_id *id,
-                                const char *name, void *value, size_t size)
-{
-       struct tdb_xattrs *attribs;
-       uint32_t i;
-       ssize_t result = -1;
-       NTSTATUS status;
-
-       DEBUG(10, ("xattr_tdb_getattr called for file %s, name %s\n",
-                  file_id_string_tos(id), name));
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       status = xattr_tdb_load_attrs(talloc_tos(), db_ctx, id, &attribs);
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("xattr_tdb_fetch_attrs failed: %s\n",
-                          nt_errstr(status)));
-               errno = EINVAL;
+       ret = xattr_tdb_get_file_id(handle, path, &id);
+       if (ret == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       for (i=0; i<attribs->num_eas; i++) {
-               if (strcmp(attribs->eas[i].name, name) == 0) {
-                       break;
-               }
-       }
-
-       if (i == attribs->num_eas) {
+       xattr_size = xattr_tdb_getattr(db, frame, &id, name, &blob);
+       if (xattr_size < 0) {
                errno = ENOATTR;
-               goto fail;
+               TALLOC_FREE(frame);
+               return -1;
        }
 
-       if (attribs->eas[i].value.length > size) {
-               errno = ERANGE;
-               goto fail;
+       if (size == 0) {
+               TALLOC_FREE(frame);
+               return xattr_size;
        }
 
-       memcpy(value, attribs->eas[i].value.data,
-              attribs->eas[i].value.length);
-       result = attribs->eas[i].value.length;
-
- fail:
-       TALLOC_FREE(attribs);
-       return result;
-}
-
-static ssize_t xattr_tdb_getxattr(struct vfs_handle_struct *handle,
-                                 const char *path, const char *name,
-                                 void *value, size_t size)
-{
-       SMB_STRUCT_STAT sbuf;
-       struct file_id id;
-       struct db_context *db;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
-       if (vfs_stat_smb_fname(handle->conn, path, &sbuf) == -1) {
+       if (blob.length > size) {
+               TALLOC_FREE(frame);
+               errno = ERANGE;
                return -1;
        }
-
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
-
-       return xattr_tdb_getattr(db, &id, name, value, size);
+       memcpy(value, blob.data, xattr_size);
+       TALLOC_FREE(frame);
+       return xattr_size;
 }
 
 static ssize_t xattr_tdb_fgetxattr(struct vfs_handle_struct *handle,
@@ -234,119 +108,69 @@ static ssize_t xattr_tdb_fgetxattr(struct vfs_handle_struct *handle,
        SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
+       ssize_t xattr_size;
+       DATA_BLOB blob;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
-       if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
-               return -1;
-       }
-
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
-
-       return xattr_tdb_getattr(db, &id, name, value, size);
-}
-
-/*
- * Worker routine for setxattr and fsetxattr
- */
-
-static int xattr_tdb_setattr(struct db_context *db_ctx,
-                            const struct file_id *id, const char *name,
-                            const void *value, size_t size, int flags)
-{
-       NTSTATUS status;
-       struct db_record *rec;
-       struct tdb_xattrs *attribs;
-       uint32_t i;
-
-       DEBUG(10, ("xattr_tdb_setattr called for file %s, name %s\n",
-                  file_id_string_tos(id), name));
-
-       rec = xattr_tdb_lock_attrs(talloc_tos(), db_ctx, id);
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (rec == NULL) {
-               DEBUG(0, ("xattr_tdb_lock_attrs failed\n"));
-               errno = EINVAL;
+       if (SMB_VFS_NEXT_FSTAT(handle, fsp, &sbuf) == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       status = xattr_tdb_pull_attrs(rec, &rec->value, &attribs);
+       id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &sbuf);
 
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("xattr_tdb_fetch_attrs failed: %s\n",
-                          nt_errstr(status)));
-               TALLOC_FREE(rec);
+       xattr_size = xattr_tdb_getattr(db, frame, &id, name, &blob);
+       if (xattr_size < 0) {
+               errno = ENOATTR;
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       for (i=0; i<attribs->num_eas; i++) {
-               if (strcmp(attribs->eas[i].name, name) == 0) {
-                       if (flags & XATTR_CREATE) {
-                               TALLOC_FREE(rec);
-                               errno = EEXIST;
-                               return -1;
-                       }
-                       break;
-               }
+       if (size == 0) {
+               TALLOC_FREE(frame);
+               return xattr_size;
        }
 
-       if (i == attribs->num_eas) {
-               struct xattr_EA *tmp;
-
-               if (flags & XATTR_REPLACE) {
-                       TALLOC_FREE(rec);
-                       errno = ENOATTR;
-                       return -1;
-               }
-
-               tmp = talloc_realloc(
-                       attribs, attribs->eas, struct xattr_EA,
-                       attribs->num_eas+ 1);
-
-               if (tmp == NULL) {
-                       DEBUG(0, ("talloc_realloc failed\n"));
-                       TALLOC_FREE(rec);
-                       errno = ENOMEM;
-                       return -1;
-               }
-
-               attribs->eas = tmp;
-               attribs->num_eas += 1;
-       }
-
-       attribs->eas[i].name = name;
-       attribs->eas[i].value.data = discard_const_p(uint8, value);
-       attribs->eas[i].value.length = size;
-
-       status = xattr_tdb_save_attrs(rec, attribs);
-
-       TALLOC_FREE(rec);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("save failed: %s\n", nt_errstr(status)));
+       if (blob.length > size) {
+               TALLOC_FREE(frame);
+               errno = ERANGE;
                return -1;
        }
-
-       return 0;
+       memcpy(value, blob.data, xattr_size);
+       TALLOC_FREE(frame);
+       return xattr_size;
 }
 
 static int xattr_tdb_setxattr(struct vfs_handle_struct *handle,
                              const char *path, const char *name,
                              const void *value, size_t size, int flags)
 {
-       SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
+       int ret;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (vfs_stat_smb_fname(handle->conn, path, &sbuf) == -1) {
+       ret = xattr_tdb_get_file_id(handle, path, &id);
+       if (ret == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
-
-       return xattr_tdb_setattr(db, &id, name, value, size, flags);
+       ret = xattr_tdb_setattr(db, &id, name, value, size, flags);
+       TALLOC_FREE(frame);
+       return ret;
 }
 
 static int xattr_tdb_fsetxattr(struct vfs_handle_struct *handle,
@@ -357,101 +181,52 @@ static int xattr_tdb_fsetxattr(struct vfs_handle_struct *handle,
        SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
+       int ret;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
-       if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
-               return -1;
-       }
-
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
-
-       return xattr_tdb_setattr(db, &id, name, value, size, flags);
-}
-
-/*
- * Worker routine for listxattr and flistxattr
- */
-
-static ssize_t xattr_tdb_listattr(struct db_context *db_ctx,
-                                 const struct file_id *id, char *list,
-                                 size_t size)
-{
-       NTSTATUS status;
-       struct tdb_xattrs *attribs;
-       uint32_t i;
-       size_t len = 0;
-
-       status = xattr_tdb_load_attrs(talloc_tos(), db_ctx, id, &attribs);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("xattr_tdb_fetch_attrs failed: %s\n",
-                          nt_errstr(status)));
-               errno = EINVAL;
-               return -1;
-       }
-
-       DEBUG(10, ("xattr_tdb_listattr: Found %d xattrs\n",
-                  attribs->num_eas));
-
-       for (i=0; i<attribs->num_eas; i++) {
-               size_t tmp;
-
-               DEBUG(10, ("xattr_tdb_listattr: xattrs[i].name: %s\n",
-                          attribs->eas[i].name));
-
-               tmp = strlen(attribs->eas[i].name);
-
-               /*
-                * Try to protect against overflow
-                */
-
-               if (len + (tmp+1) < len) {
-                       TALLOC_FREE(attribs);
-                       errno = EINVAL;
-                       return -1;
-               }
-
-               /*
-                * Take care of the terminating NULL
-                */
-               len += (tmp + 1);
-       }
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (len > size) {
-               TALLOC_FREE(attribs);
-               errno = ERANGE;
+       if (SMB_VFS_NEXT_FSTAT(handle, fsp, &sbuf) == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       len = 0;
+       id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &sbuf);
 
-       for (i=0; i<attribs->num_eas; i++) {
-               strlcpy(list+len, attribs->eas[i].name,
-                       size-len);
-               len += (strlen(attribs->eas[i].name) + 1);
-       }
+       ret = xattr_tdb_setattr(db, &id, name, value, size, flags);
+       TALLOC_FREE(frame);
+       return ret;
 
-       TALLOC_FREE(attribs);
-       return len;
 }
 
 static ssize_t xattr_tdb_listxattr(struct vfs_handle_struct *handle,
                                   const char *path, char *list, size_t size)
 {
-       SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
+       int ret;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (vfs_stat_smb_fname(handle->conn, path, &sbuf) == -1) {
+       ret = xattr_tdb_get_file_id(handle, path, &id);
+       if (ret == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
+       ret = xattr_tdb_listattr(db, &id, list, size);
+       TALLOC_FREE(frame);
+       return ret;
 
-       return xattr_tdb_listattr(db, &id, list, size);
 }
 
 static ssize_t xattr_tdb_flistxattr(struct vfs_handle_struct *handle,
@@ -461,97 +236,51 @@ static ssize_t xattr_tdb_flistxattr(struct vfs_handle_struct *handle,
        SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
+       int ret;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
-       if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
-               return -1;
-       }
-
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
-
-       return xattr_tdb_listattr(db, &id, list, size);
-}
-
-/*
- * Worker routine for removexattr and fremovexattr
- */
-
-static int xattr_tdb_removeattr(struct db_context *db_ctx,
-                               const struct file_id *id, const char *name)
-{
-       NTSTATUS status;
-       struct db_record *rec;
-       struct tdb_xattrs *attribs;
-       uint32_t i;
-
-       rec = xattr_tdb_lock_attrs(talloc_tos(), db_ctx, id);
-
-       if (rec == NULL) {
-               DEBUG(0, ("xattr_tdb_lock_attrs failed\n"));
-               errno = EINVAL;
-               return -1;
-       }
-
-       status = xattr_tdb_pull_attrs(rec, &rec->value, &attribs);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10, ("xattr_tdb_fetch_attrs failed: %s\n",
-                          nt_errstr(status)));
-               TALLOC_FREE(rec);
-               return -1;
-       }
-
-       for (i=0; i<attribs->num_eas; i++) {
-               if (strcmp(attribs->eas[i].name, name) == 0) {
-                       break;
-               }
-       }
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (i == attribs->num_eas) {
-               TALLOC_FREE(rec);
-               errno = ENOATTR;
+       if (SMB_VFS_NEXT_FSTAT(handle, fsp, &sbuf) == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       attribs->eas[i] =
-               attribs->eas[attribs->num_eas-1];
-       attribs->num_eas -= 1;
-
-       if (attribs->num_eas == 0) {
-               rec->delete_rec(rec);
-               TALLOC_FREE(rec);
-               return 0;
-       }
+       id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &sbuf);
 
-       status = xattr_tdb_save_attrs(rec, attribs);
-
-       TALLOC_FREE(rec);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(1, ("save failed: %s\n", nt_errstr(status)));
-               return -1;
-       }
-
-       return 0;
+       ret = xattr_tdb_listattr(db, &id, list, size);
+       TALLOC_FREE(frame);
+       return ret;
 }
 
 static int xattr_tdb_removexattr(struct vfs_handle_struct *handle,
                                 const char *path, const char *name)
 {
-       SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
+       int ret;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (vfs_stat_smb_fname(handle->conn, path, &sbuf) == -1) {
-               return -1;
+       ret = xattr_tdb_get_file_id(handle, path, &id);
+       if (ret == -1) {
+               TALLOC_FREE(frame);
+               return ret;
        }
 
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
-
-       return xattr_tdb_removeattr(db, &id, name);
+       
+       ret = xattr_tdb_removeattr(db, &id, name);
+       TALLOC_FREE(frame);
+       return ret;
 }
 
 static int xattr_tdb_fremovexattr(struct vfs_handle_struct *handle,
@@ -560,23 +289,32 @@ static int xattr_tdb_fremovexattr(struct vfs_handle_struct *handle,
        SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
+       int ret;
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
 
-       if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
+       if (SMB_VFS_NEXT_FSTAT(handle, fsp, &sbuf) == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
+       id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &sbuf);
 
-       return xattr_tdb_removeattr(db, &id, name);
+       ret = xattr_tdb_removeattr(db, &id, name);
+       TALLOC_FREE(frame);
+       return ret;
 }
 
 /*
  * Open the tdb file upon VFS_CONNECT
  */
 
-static bool xattr_tdb_init(int snum, struct db_context **p_db)
+static bool xattr_tdb_init(int snum, TALLOC_CTX *mem_ctx, struct db_context **p_db)
 {
        struct db_context *db;
        const char *dbname;
@@ -593,7 +331,8 @@ static bool xattr_tdb_init(int snum, struct db_context **p_db)
        /* now we know dbname is not NULL */
 
        become_root();
-       db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+       db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600,
+                    DBWRAP_LOCK_ORDER_2, DBWRAP_FLAG_NONE);
        unbecome_root();
 
        if (db == NULL) {
@@ -611,6 +350,105 @@ static bool xattr_tdb_init(int snum, struct db_context **p_db)
        return true;
 }
 
+static int xattr_tdb_open(vfs_handle_struct *handle,
+                       struct smb_filename *smb_fname,
+                       files_struct *fsp,
+                       int flags,
+                       mode_t mode)
+{
+       struct db_context *db = NULL;
+       TALLOC_CTX *frame = NULL;
+       int ret;
+
+       fsp->fh->fd = SMB_VFS_NEXT_OPEN(handle,
+                               smb_fname, fsp,
+                               flags,
+                               mode);
+
+       if (fsp->fh->fd < 0) {
+               return fsp->fh->fd;
+       }
+
+       if ((flags & (O_CREAT|O_EXCL)) != (O_CREAT|O_EXCL)) {
+               return fsp->fh->fd;
+       }
+
+       /*
+        * We know we used O_CREAT|O_EXCL and it worked.
+        * We must have created the file.
+        */
+
+       ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
+       if (ret == -1) {
+               /* Can't happen... */
+               DBG_WARNING("SMB_VFS_FSTAT failed on file %s (%s)\n",
+                       smb_fname_str_dbg(smb_fname),
+                       strerror(errno));
+               return -1;
+       }
+       fsp->file_id = SMB_VFS_FILE_ID_CREATE(fsp->conn, &smb_fname->st);
+
+       frame = talloc_stackframe();
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
+
+       xattr_tdb_remove_all_attrs(db, &fsp->file_id);
+       TALLOC_FREE(frame);
+       return fsp->fh->fd;
+}
+
+static int xattr_tdb_mkdir(vfs_handle_struct *handle,
+               const struct smb_filename *smb_fname,
+               mode_t mode)
+{
+       struct db_context *db = NULL;
+       TALLOC_CTX *frame = NULL;
+       struct file_id fileid;
+       int ret;
+       struct smb_filename *smb_fname_tmp = NULL;
+
+       ret = SMB_VFS_NEXT_MKDIR(handle, smb_fname, mode);
+       if (ret < 0) {
+               return ret;
+       }
+
+       frame = talloc_stackframe();
+       smb_fname_tmp = cp_smb_filename(frame, smb_fname);
+       if (smb_fname_tmp == NULL) {
+               TALLOC_FREE(frame);
+               errno = ENOMEM;
+               return -1;
+       }
+
+       /* Always use LSTAT here - we just creaded the directory. */
+       ret = SMB_VFS_LSTAT(handle->conn, smb_fname_tmp);
+       if (ret == -1) {
+               /* Rename race. Let upper level take care of it. */
+               TALLOC_FREE(frame);
+               return -1;
+       }
+       if (!S_ISDIR(smb_fname_tmp->st.st_ex_mode)) {
+               /* Rename race. Let upper level take care of it. */
+               TALLOC_FREE(frame);
+               return -1;
+       }
+
+       fileid = SMB_VFS_FILE_ID_CREATE(handle->conn, &smb_fname_tmp->st);
+
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
+
+       xattr_tdb_remove_all_attrs(db, &fileid);
+       TALLOC_FREE(frame);
+       return 0;
+}
+
 /*
  * On unlink we need to delete the tdb record
  */
@@ -620,23 +458,27 @@ static int xattr_tdb_unlink(vfs_handle_struct *handle,
        struct smb_filename *smb_fname_tmp = NULL;
        struct file_id id;
        struct db_context *db;
-       struct db_record *rec;
-       NTSTATUS status;
        int ret = -1;
        bool remove_record = false;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
-       status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
+
+       smb_fname_tmp = cp_smb_filename(frame, smb_fname);
+       if (smb_fname_tmp == NULL) {
+               TALLOC_FREE(frame);
+               errno = ENOMEM;
                return -1;
        }
 
-       if (lp_posix_pathnames()) {
-               ret = SMB_VFS_LSTAT(handle->conn, smb_fname_tmp);
+       if (smb_fname_tmp->flags & SMB_FILENAME_POSIX_PATH) {
+               ret = SMB_VFS_NEXT_LSTAT(handle, smb_fname_tmp);
        } else {
-               ret = SMB_VFS_STAT(handle->conn, smb_fname_tmp);
+               ret = SMB_VFS_NEXT_STAT(handle, smb_fname_tmp);
        }
        if (ret == -1) {
                goto out;
@@ -657,60 +499,52 @@ static int xattr_tdb_unlink(vfs_handle_struct *handle,
                goto out;
        }
 
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &smb_fname_tmp->st);
-
-       rec = xattr_tdb_lock_attrs(talloc_tos(), db, &id);
+       id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &smb_fname_tmp->st);
 
-       /*
-        * If rec == NULL there's not much we can do about it
-        */
-
-       if (rec != NULL) {
-               rec->delete_rec(rec);
-               TALLOC_FREE(rec);
-       }
+       xattr_tdb_remove_all_attrs(db, &id);
 
  out:
-       TALLOC_FREE(smb_fname_tmp);
+       TALLOC_FREE(frame);
        return ret;
 }
 
 /*
  * On rmdir we need to delete the tdb record
  */
-static int xattr_tdb_rmdir(vfs_handle_struct *handle, const char *path)
+static int xattr_tdb_rmdir(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname)
 {
        SMB_STRUCT_STAT sbuf;
        struct file_id id;
        struct db_context *db;
-       struct db_record *rec;
        int ret;
-
-       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
-
-       if (vfs_stat_smb_fname(handle->conn, path, &sbuf) == -1) {
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
+                               if (!xattr_tdb_init(-1, frame, &db))
+                               {
+                                       TALLOC_FREE(frame); return -1;
+                               });
+
+       if (vfs_stat_smb_basename(handle->conn,
+                               smb_fname,
+                               &sbuf) == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       ret = SMB_VFS_NEXT_RMDIR(handle, path);
+       ret = SMB_VFS_NEXT_RMDIR(handle, smb_fname);
 
        if (ret == -1) {
+               TALLOC_FREE(frame);
                return -1;
        }
 
-       id = SMB_VFS_FILE_ID_CREATE(handle->conn, &sbuf);
+       id = SMB_VFS_NEXT_FILE_ID_CREATE(handle, &sbuf);
 
-       rec = xattr_tdb_lock_attrs(talloc_tos(), db, &id);
-
-       /*
-        * If rec == NULL there's not much we can do about it
-        */
-
-       if (rec != NULL) {
-               rec->delete_rec(rec);
-               TALLOC_FREE(rec);
-       }
+       xattr_tdb_remove_all_attrs(db, &id);
 
+       TALLOC_FREE(frame);
        return 0;
 }
 
@@ -744,7 +578,7 @@ static int xattr_tdb_connect(vfs_handle_struct *handle, const char *service,
                return 0;
        }
 
-       if (!xattr_tdb_init(snum, &db)) {
+       if (!xattr_tdb_init(snum, NULL, &db)) {
                DEBUG(5, ("Could not init xattr tdb\n"));
                lp_do_parameter(snum, "ea support", "False");
                return 0;
@@ -759,21 +593,23 @@ static int xattr_tdb_connect(vfs_handle_struct *handle, const char *service,
 }
 
 static struct vfs_fn_pointers vfs_xattr_tdb_fns = {
-       .getxattr = xattr_tdb_getxattr,
-       .fgetxattr = xattr_tdb_fgetxattr,
-       .setxattr = xattr_tdb_setxattr,
-       .fsetxattr = xattr_tdb_fsetxattr,
-       .listxattr = xattr_tdb_listxattr,
-       .flistxattr = xattr_tdb_flistxattr,
-       .removexattr = xattr_tdb_removexattr,
-       .fremovexattr = xattr_tdb_fremovexattr,
-       .unlink = xattr_tdb_unlink,
-       .rmdir = xattr_tdb_rmdir,
+       .getxattr_fn = xattr_tdb_getxattr,
+       .fgetxattr_fn = xattr_tdb_fgetxattr,
+       .setxattr_fn = xattr_tdb_setxattr,
+       .fsetxattr_fn = xattr_tdb_fsetxattr,
+       .listxattr_fn = xattr_tdb_listxattr,
+       .flistxattr_fn = xattr_tdb_flistxattr,
+       .removexattr_fn = xattr_tdb_removexattr,
+       .fremovexattr_fn = xattr_tdb_fremovexattr,
+       .open_fn = xattr_tdb_open,
+       .mkdir_fn = xattr_tdb_mkdir,
+       .unlink_fn = xattr_tdb_unlink,
+       .rmdir_fn = xattr_tdb_rmdir,
        .connect_fn = xattr_tdb_connect,
 };
 
-NTSTATUS vfs_xattr_tdb_init(void);
-NTSTATUS vfs_xattr_tdb_init(void)
+NTSTATUS vfs_xattr_tdb_init(TALLOC_CTX *);
+NTSTATUS vfs_xattr_tdb_init(TALLOC_CTX *ctx)
 {
        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "xattr_tdb",
                                &vfs_xattr_tdb_fns);