s3/pysmbd: use SMB_VFS_OPENAT() in init_files_struct()
[samba.git] / source3 / smbd / pysmbd.c
index 1dd3d62e194cf978cb438808172e1b186fd94e4c..7f671cf6eeb239b020e532ec9b10c1d91ea335f7 100644 (file)
@@ -1,7 +1,7 @@
 /*
    Unix SMB/CIFS implementation.
-   Set NT and POSIX ACLs and other VFS operations from Python 
-   
+   Set NT and POSIX ACLs and other VFS operations from Python
+
    Copyrigyt (C) Andrew Bartlett 2012
    Copyright (C) Jeremy Allison 1994-2009.
    Copyright (C) Andreas Gruenbacher 2002.
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <Python.h>
 #include "includes.h"
+#include "python/py3compat.h"
+#include "python/modules.h"
 #include "smbd/smbd.h"
-#include <Python.h>
 #include "libcli/util/pyerrors.h"
 #include "librpc/rpc/pyrpc_util.h"
 #include <pytalloc.h>
 #include "system/filesys.h"
+#include "passdb.h"
+#include "secrets.h"
+#include "auth.h"
 
 extern const struct generic_mapping file_generic_mapping;
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_ACLS
 
-static NTSTATUS set_sys_acl_no_snum(const char *fname,
-                                    SMB_ACL_TYPE_T acltype,
-                                    SMB_ACL_T theacl)
+#ifdef O_DIRECTORY
+#define DIRECTORY_FLAGS O_RDONLY|O_DIRECTORY
+#else
+/* POSIX allows us to open a directory with O_RDONLY. */
+#define DIRECTORY_FLAGS O_RDONLY
+#endif
+
+
+static connection_struct *get_conn_tos(
+       const char *service,
+       const struct auth_session_info *session_info)
 {
-       connection_struct *conn;
-       NTSTATUS status = NT_STATUS_OK;
+       struct conn_struct_tos *c = NULL;
+       int snum = -1;
+       NTSTATUS status;
+       char *cwd = NULL;
+       struct smb_filename cwd_fname = {0};
        int ret;
 
-       conn = talloc_zero(NULL, connection_struct);
-       if (conn == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               return NT_STATUS_NO_MEMORY;
+       if (!posix_locking_init(false)) {
+               PyErr_NoMemory();
+               return NULL;
        }
 
-       if (!(conn->params = talloc(conn, struct share_params))) {
-               DEBUG(0,("get_nt_acl_no_snum: talloc() failed!\n"));
-               TALLOC_FREE(conn);
-               return NT_STATUS_NO_MEMORY;
+       if (service) {
+               snum = lp_servicenumber(service);
+               if (snum == -1) {
+                       PyErr_SetString(PyExc_RuntimeError, "unknown service");
+                       return NULL;
+               }
        }
 
-       conn->params->service = -1;
+       status = create_conn_struct_tos(NULL,
+                                       snum,
+                                       "/",
+                                       session_info,
+                                       &c);
+       PyErr_NTSTATUS_IS_ERR_RAISE(status);
 
-       set_conn_connectpath(conn, "/");
+       /* Ignore read-only and share restrictions */
+       c->conn->read_only = false;
+       c->conn->share_access = SEC_RIGHTS_FILE_ALL;
 
-       smbd_vfs_init(conn);
+       /* Provided by libreplace if not present. Always mallocs. */
+       cwd = get_current_dir_name();
+       if (cwd == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
 
-       ret = SMB_VFS_SYS_ACL_SET_FILE( conn, fname, acltype, theacl);
+       cwd_fname.base_name = cwd;
+       /*
+        * We need to call vfs_ChDir() to initialize
+        * conn->cwd_fsp correctly. Change directory
+        * to current directory (so no change for process).
+        */
+       ret = vfs_ChDir(c->conn, &cwd_fname);
        if (ret != 0) {
-               status = map_nt_error_from_unix_common(ret);
-               DEBUG(0,("set_nt_acl_no_snum: fset_nt_acl returned zero.\n"));
+               status = map_nt_error_from_unix(errno);
+               SAFE_FREE(cwd);
+               PyErr_NTSTATUS_IS_ERR_RAISE(status);
        }
 
-       conn_free(conn);
+       SAFE_FREE(cwd);
 
-       return status;
+       return c->conn;
 }
 
-static NTSTATUS set_nt_acl_no_snum(const char *fname,
-                                  uint32 security_info_sent, const struct security_descriptor *sd)
+static int set_sys_acl_conn(const char *fname,
+                                SMB_ACL_TYPE_T acltype,
+                                SMB_ACL_T theacl, connection_struct *conn)
 {
-       TALLOC_CTX *frame = talloc_stackframe();
-       connection_struct *conn;
-       NTSTATUS status = NT_STATUS_OK;
-       files_struct *fsp;
+       int ret;
        struct smb_filename *smb_fname = NULL;
-       int flags;
 
-       conn = talloc_zero(frame, connection_struct);
-       if (conn == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
+       TALLOC_CTX *frame = talloc_stackframe();
 
-       if (!(conn->params = talloc(conn, struct share_params))) {
-               DEBUG(0,("get_nt_acl_no_snum: talloc() failed!\n"));
+       smb_fname = synthetic_smb_fname_split(frame,
+                                       fname,
+                                       lp_posix_pathnames());
+       if (smb_fname == NULL) {
                TALLOC_FREE(frame);
-               return NT_STATUS_NO_MEMORY;
+               return -1;
        }
 
-       conn->params->service = -1;
+       ret = SMB_VFS_SYS_ACL_SET_FILE( conn, smb_fname, acltype, theacl);
+
+       TALLOC_FREE(frame);
+       return ret;
+}
 
-       set_conn_connectpath(conn, "/");
 
-       smbd_vfs_init(conn);
+static NTSTATUS init_files_struct(TALLOC_CTX *mem_ctx,
+                                 const char *fname,
+                                 struct connection_struct *conn,
+                                 int flags,
+                                 struct files_struct **_fsp)
+{
+       struct smb_filename *smb_fname = NULL;
+       int ret;
+       mode_t saved_umask;
+       struct files_struct *fsp;
+       struct files_struct *fspcwd = NULL;
+       NTSTATUS status;
 
-       fsp = talloc(frame, struct files_struct);
+       fsp = talloc_zero(mem_ctx, struct files_struct);
        if (fsp == NULL) {
-               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
        fsp->fh = talloc(fsp, struct fd_handle);
        if (fsp->fh == NULL) {
-               TALLOC_FREE(frame);
                return NT_STATUS_NO_MEMORY;
        }
        fsp->conn = conn;
 
-       status = create_synthetic_smb_fname_split(fsp, fname, NULL,
-                                                 &smb_fname);
+       smb_fname = synthetic_smb_fname_split(fsp,
+                                             fname,
+                                             lp_posix_pathnames());
+       if (smb_fname == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       fsp->fsp_name = smb_fname;
+
+       status = vfs_at_fspcwd(fsp, conn, &fspcwd);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(frame);
                return status;
        }
 
-       fsp->fsp_name = smb_fname;
+       /*
+        * we want total control over the permissions on created files,
+        * so set our umask to 0 (this matters if flags contains O_CREAT)
+        */
+       saved_umask = umask(0);
 
-#ifdef O_DIRECTORY
-       flags = O_RDONLY|O_DIRECTORY;
-#else
-       /* POSIX allows us to open a directory with O_RDONLY. */
-       flags = O_RDONLY;
-#endif
+       fsp->fh->fd = SMB_VFS_OPENAT(conn,
+                                    fspcwd,
+                                    smb_fname,
+                                    fsp,
+                                    flags,
+                                    00644);
+
+       umask(saved_umask);
 
-       fsp->fh->fd = SMB_VFS_OPEN(conn, smb_fname, fsp, flags, 00400);
-       if (fsp->fh->fd == -1 && errno == EISDIR) {
-               fsp->fh->fd = SMB_VFS_OPEN(conn, smb_fname, fsp, O_RDWR, 00400);
-       }
        if (fsp->fh->fd == -1) {
-               printf("open: error=%d (%s)\n", errno, strerror(errno));
+               int err = errno;
+               if (err == ENOENT) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               }
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       ret = SMB_VFS_FSTAT(fsp, &smb_fname->st);
+       if (ret == -1) {
+               /* If we have an fd, this stat should succeed. */
+               DEBUG(0,("Error doing fstat on open file %s (%s)\n",
+                        smb_fname_str_dbg(smb_fname),
+                        strerror(errno) ));
+               return map_nt_error_from_unix(errno);
+       }
+
+       fsp->file_id = vfs_file_id_from_sbuf(conn, &smb_fname->st);
+       fsp->vuid = UID_FIELD_INVALID;
+       fsp->file_pid = 0;
+       fsp->fsp_flags.can_lock = true;
+       fsp->fsp_flags.can_read = true;
+       fsp->fsp_flags.can_write = true;
+       fsp->print_file = NULL;
+       fsp->fsp_flags.modified = false;
+       fsp->sent_oplock_break = NO_BREAK_SENT;
+       fsp->fsp_flags.is_directory = S_ISDIR(smb_fname->st.st_ex_mode);
+
+       *_fsp = fsp;
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS set_nt_acl_conn(const char *fname,
+                               uint32_t security_info_sent, const struct security_descriptor *sd,
+                               connection_struct *conn)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct files_struct *fsp = NULL;
+       NTSTATUS status = NT_STATUS_OK;
+
+       /* first, try to open it as a file with flag O_RDWR */
+       status = init_files_struct(frame,
+                                  fname,
+                                  conn,
+                                  O_RDWR,
+                                  &fsp);
+       if (!NT_STATUS_IS_OK(status) && errno == EISDIR) {
+               /* if fail, try to open as dir */
+               status = init_files_struct(frame,
+                                          fname,
+                                          conn,
+                                          DIRECTORY_FLAGS,
+                                          &fsp);
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_ERR("init_files_struct failed: %s\n",
+                       nt_errstr(status));
+               if (fsp != NULL) {
+                       SMB_VFS_CLOSE(fsp);
+               }
                TALLOC_FREE(frame);
-               return NT_STATUS_UNSUCCESSFUL;
+               return status;
        }
 
-       status = SMB_VFS_FSET_NT_ACL( fsp, security_info_sent, sd);
+       status = SMB_VFS_FSET_NT_ACL(fsp, security_info_sent, sd);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0,("set_nt_acl_no_snum: fset_nt_acl returned %s.\n", nt_errstr(status)));
        }
 
-       conn_free(conn);
+       SMB_VFS_CLOSE(fsp);
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
+static NTSTATUS get_nt_acl_conn(TALLOC_CTX *mem_ctx,
+                               const char *fname,
+                               connection_struct *conn,
+                               uint32_t security_info_wanted,
+                               struct security_descriptor **sd)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       NTSTATUS status;
+       struct smb_filename *smb_fname = synthetic_smb_fname(talloc_tos(),
+                                       fname,
+                                       NULL,
+                                       NULL,
+                                       0,
+                                       lp_posix_pathnames() ?
+                                               SMB_FILENAME_POSIX_PATH : 0);
+
+       if (smb_fname == NULL) {
+               TALLOC_FREE(frame);
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       status = SMB_VFS_GET_NT_ACL_AT(conn,
+                               conn->cwd_fsp,
+                               smb_fname,
+                               security_info_wanted,
+                               mem_ctx,
+                               sd);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_ERR("get_nt_acl_at returned %s.\n",
+                       nt_errstr(status));
+       }
+
        TALLOC_FREE(frame);
 
        return status;
 }
 
+static int set_acl_entry_perms(SMB_ACL_ENTRY_T entry, mode_t perm_mask)
+{
+       SMB_ACL_PERMSET_T perms = NULL;
+
+       if (sys_acl_get_permset(entry, &perms) != 0) {
+               return -1;
+       }
 
-static SMB_ACL_T make_simple_acl(uid_t uid, gid_t gid)
+       if (sys_acl_clear_perms(perms) != 0) {
+               return -1;
+       }
+
+       if ((perm_mask & SMB_ACL_READ) != 0 &&
+           sys_acl_add_perm(perms, SMB_ACL_READ) != 0) {
+               return -1;
+       }
+
+       if ((perm_mask & SMB_ACL_WRITE) != 0 &&
+           sys_acl_add_perm(perms, SMB_ACL_WRITE) != 0) {
+               return -1;
+       }
+
+       if ((perm_mask & SMB_ACL_EXECUTE) != 0 &&
+           sys_acl_add_perm(perms, SMB_ACL_EXECUTE) != 0) {
+               return -1;
+       }
+
+       if (sys_acl_set_permset(entry, perms) != 0) {
+               return -1;
+       }
+
+       return 0;
+}
+
+static SMB_ACL_T make_simple_acl(TALLOC_CTX *mem_ctx,
+                       gid_t gid,
+                       mode_t chmod_mode)
 {
-       mode_t mode = SMB_ACL_READ|SMB_ACL_WRITE;
-       mode_t mode0 = 0;
+       mode_t mode = SMB_ACL_READ|SMB_ACL_WRITE|SMB_ACL_EXECUTE;
 
+       mode_t mode_user = (chmod_mode & 0700) >> 6;
+       mode_t mode_group = (chmod_mode & 070) >> 3;
+       mode_t mode_other = chmod_mode &  07;
        SMB_ACL_ENTRY_T entry;
-       SMB_ACL_T acl = sys_acl_init(4);
+       SMB_ACL_T acl = sys_acl_init(mem_ctx);
 
        if (!acl) {
                return NULL;
        }
 
        if (sys_acl_create_entry(&acl, &entry) != 0) {
-               sys_acl_free_acl(acl);
+               TALLOC_FREE(acl);
                return NULL;
        }
 
        if (sys_acl_set_tag_type(entry, SMB_ACL_USER_OBJ) != 0) {
-               sys_acl_free_acl(acl);
+               TALLOC_FREE(acl);
                return NULL;
        }
 
-       if (sys_acl_set_permset(entry, &mode) != 0) {
-               sys_acl_free_acl(acl);
+       if (set_acl_entry_perms(entry, mode_user) != 0) {
+               TALLOC_FREE(acl);
                return NULL;
        }
 
        if (sys_acl_create_entry(&acl, &entry) != 0) {
-               sys_acl_free_acl(acl);
+               TALLOC_FREE(acl);
                return NULL;
        }
 
        if (sys_acl_set_tag_type(entry, SMB_ACL_GROUP_OBJ) != 0) {
-               sys_acl_free_acl(acl);
+               TALLOC_FREE(acl);
                return NULL;
        }
 
-       if (sys_acl_set_permset(entry, &mode) != 0) {
-               sys_acl_free_acl(acl);
+       if (set_acl_entry_perms(entry, mode_group) != 0) {
+               TALLOC_FREE(acl);
                return NULL;
        }
 
        if (sys_acl_create_entry(&acl, &entry) != 0) {
-               sys_acl_free_acl(acl);
+               TALLOC_FREE(acl);
                return NULL;
        }
 
        if (sys_acl_set_tag_type(entry, SMB_ACL_OTHER) != 0) {
-               sys_acl_free_acl(acl);
+               TALLOC_FREE(acl);
                return NULL;
        }
 
-       if (sys_acl_set_permset(entry, &mode0) != 0) {
-               sys_acl_free_acl(acl);
+       if (set_acl_entry_perms(entry, mode_other) != 0) {
+               TALLOC_FREE(acl);
                return NULL;
        }
 
+       if (gid != -1) {
+               if (sys_acl_create_entry(&acl, &entry) != 0) {
+                       TALLOC_FREE(acl);
+                       return NULL;
+               }
+
+               if (sys_acl_set_tag_type(entry, SMB_ACL_GROUP) != 0) {
+                       TALLOC_FREE(acl);
+                       return NULL;
+               }
+
+               if (sys_acl_set_qualifier(entry, &gid) != 0) {
+                       TALLOC_FREE(acl);
+                       return NULL;
+               }
+
+               if (set_acl_entry_perms(entry, mode_group) != 0) {
+                       TALLOC_FREE(acl);
+                       return NULL;
+               }
+       }
+
        if (sys_acl_create_entry(&acl, &entry) != 0) {
-               sys_acl_free_acl(acl);
+               TALLOC_FREE(acl);
                return NULL;
        }
 
-       if (sys_acl_set_tag_type(entry, SMB_ACL_GROUP) != 0) {
-               sys_acl_free_acl(acl);
+       if (sys_acl_set_tag_type(entry, SMB_ACL_MASK) != 0) {
+               TALLOC_FREE(acl);
                return NULL;
        }
 
-       if (sys_acl_set_qualifier(entry, &gid) != 0) {
-               sys_acl_free_acl(acl);
+       if (set_acl_entry_perms(entry, mode) != 0) {
+               TALLOC_FREE(acl);
                return NULL;
        }
 
-       if (sys_acl_set_permset(entry, &mode) != 0) {
-               sys_acl_free_acl(acl);
+       return acl;
+}
+
+/*
+  set a simple ACL on a file, as a test
+ */
+static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+       const char * const kwnames[] = {
+               "fname",
+               "mode",
+               "session_info",
+               "gid",
+               "service",
+               NULL
+       };
+       char *fname, *service = NULL;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       int ret;
+       int mode, gid = -1;
+       SMB_ACL_T acl;
+       TALLOC_CTX *frame;
+       connection_struct *conn;
+
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO|iz",
+                                        discard_const_p(char *, kwnames),
+                                        &fname,
+                                        &mode,
+                                        &py_session,
+                                        &gid,
+                                        &service))
                return NULL;
-       }
 
-       if (sys_acl_create_entry(&acl, &entry) != 0) {
-               sys_acl_free_acl(acl);
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
                return NULL;
        }
 
-       if (sys_acl_set_tag_type(entry, SMB_ACL_MASK) != 0) {
-               sys_acl_free_acl(acl);
+       frame = talloc_stackframe();
+
+       acl = make_simple_acl(frame, gid, mode);
+       if (acl == NULL) {
+               TALLOC_FREE(frame);
                return NULL;
        }
 
-       if (sys_acl_set_permset(entry, &mode0) != 0) {
-               sys_acl_free_acl(acl);
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
                return NULL;
        }
-       return acl;
+
+       ret = set_sys_acl_conn(fname, SMB_ACL_TYPE_ACCESS, acl, conn);
+
+       if (ret != 0) {
+               TALLOC_FREE(frame);
+               errno = ret;
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+
+       TALLOC_FREE(frame);
+
+       Py_RETURN_NONE;
 }
 
 /*
-  set a simple ACL on a file, as a test
+  chown a file
  */
-static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args)
+static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)
 {
+       const char * const kwnames[] = {
+               "fname",
+               "uid",
+               "gid",
+               "session_info",
+               "service",
+               NULL
+       };
+       connection_struct *conn;
+       int ret;
        NTSTATUS status;
-       char *fname;
+       char *fname, *service = NULL;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
        int uid, gid;
-       SMB_ACL_T acl;
+       TALLOC_CTX *frame;
+       struct files_struct *fsp = NULL;
+
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siiO|z",
+                                        discard_const_p(char *, kwnames),
+                                        &fname,
+                                        &uid,
+                                        &gid,
+                                        &py_session,
+                                        &service))
+               return NULL;
 
-       if (!PyArg_ParseTuple(args, "sii", &fname, &uid, &gid))
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
                return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
+               return NULL;
+       }
 
-       acl = make_simple_acl(uid, gid);
+       frame = talloc_stackframe();
 
-       status = set_sys_acl_no_snum(fname, SMB_ACL_TYPE_ACCESS, acl);
-       sys_acl_free_acl(acl);
-       PyErr_NTSTATUS_IS_ERR_RAISE(status);
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       /* first, try to open it as a file with flag O_RDWR */
+       status = init_files_struct(frame,
+                                  fname,
+                                  conn,
+                                  O_RDWR,
+                                  &fsp);
+       if (!NT_STATUS_IS_OK(status) && errno == EISDIR) {
+               /* if fail, try to open as dir */
+               status = init_files_struct(frame,
+                                          fname,
+                                          conn,
+                                          DIRECTORY_FLAGS,
+                                          &fsp);
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_ERR("init_files_struct failed: %s\n",
+                       nt_errstr(status));
+               if (fsp != NULL) {
+                       SMB_VFS_CLOSE(fsp);
+               }
+               TALLOC_FREE(frame);
+               /*
+                * The following macro raises a python
+                * error then returns NULL.
+                */
+               PyErr_NTSTATUS_IS_ERR_RAISE(status);
+       }
+
+       ret = SMB_VFS_FCHOWN(fsp, uid, gid);
+       if (ret != 0) {
+               int saved_errno = errno;
+               SMB_VFS_CLOSE(fsp);
+               TALLOC_FREE(frame);
+               errno = saved_errno;
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+
+       SMB_VFS_CLOSE(fsp);
+       TALLOC_FREE(frame);
+
+       Py_RETURN_NONE;
+}
+
+/*
+  unlink a file
+ */
+static PyObject *py_smbd_unlink(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+       const char * const kwnames[] = {
+               "fname",
+               "session_info",
+               "service",
+               NULL
+       };
+       connection_struct *conn;
+       int ret;
+       struct smb_filename *smb_fname = NULL;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       char *fname, *service = NULL;
+       TALLOC_CTX *frame;
+
+       frame = talloc_stackframe();
+
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|z",
+                                        discard_const_p(char *, kwnames),
+                                        &fname,
+                                        &py_session ,
+                                        &service)) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       smb_fname = synthetic_smb_fname_split(frame,
+                                       fname,
+                                       lp_posix_pathnames());
+       if (smb_fname == NULL) {
+               TALLOC_FREE(frame);
+               return PyErr_NoMemory();
+       }
+
+       ret = SMB_VFS_UNLINKAT(conn,
+                       conn->cwd_fsp,
+                       smb_fname,
+                       0);
+       if (ret != 0) {
+               TALLOC_FREE(frame);
+               errno = ret;
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+
+       TALLOC_FREE(frame);
 
        Py_RETURN_NONE;
 }
@@ -270,7 +682,8 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args)
 /*
   check if we have ACL support
  */
-static PyObject *py_smbd_have_posix_acls(PyObject *self, PyObject *args)
+static PyObject *py_smbd_have_posix_acls(PyObject *self,
+               PyObject *Py_UNUSED(ignored))
 {
 #ifdef HAVE_POSIX_ACLS
        return PyBool_FromLong(true);
@@ -280,52 +693,506 @@ static PyObject *py_smbd_have_posix_acls(PyObject *self, PyObject *args)
 }
 
 /*
-  set a simple ACL on a file, as a test
+  set the NT ACL on a file
  */
-static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args)
+static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
+       const char * const kwnames[] = {
+               "fname",
+               "security_info_sent",
+               "sd",
+               "session_info",
+               "service",
+               NULL
+       };
+
        NTSTATUS status;
-       char *fname;
+       char *fname, *service = NULL;
        int security_info_sent;
        PyObject *py_sd;
        struct security_descriptor *sd;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       connection_struct *conn;
+       TALLOC_CTX *frame;
 
-       if (!PyArg_ParseTuple(args, "siO", &fname, &security_info_sent, &py_sd))
+       frame = talloc_stackframe();
+
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siOO|z",
+                                        discard_const_p(char *, kwnames),
+                                        &fname,
+                                        &security_info_sent,
+                                        &py_sd,
+                                        &py_session,
+                                        &service)) {
+               TALLOC_FREE(frame);
                return NULL;
+       }
 
        if (!py_check_dcerpc_type(py_sd, "samba.dcerpc.security", "descriptor")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
+               return NULL;
+       }
+
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
                return NULL;
        }
 
        sd = pytalloc_get_type(py_sd, struct security_descriptor);
 
-       status = set_nt_acl_no_snum(fname, security_info_sent, sd);
+       status = set_nt_acl_conn(fname, security_info_sent, sd, conn);
+       TALLOC_FREE(frame);
        PyErr_NTSTATUS_IS_ERR_RAISE(status);
 
        Py_RETURN_NONE;
 }
 
+/*
+  Return the NT ACL on a file
+ */
+static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+       const char * const kwnames[] = {
+               "fname",
+               "security_info_wanted",
+               "session_info",
+               "service",
+               NULL
+       };
+       char *fname, *service = NULL;
+       int security_info_wanted;
+       PyObject *py_sd;
+       struct security_descriptor *sd;
+       TALLOC_CTX *frame = talloc_stackframe();
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       connection_struct *conn;
+       NTSTATUS status;
+       int ret = 1;
+
+       ret = PyArg_ParseTupleAndKeywords(args,
+                                         kwargs,
+                                         "siO|z",
+                                         discard_const_p(char *, kwnames),
+                                         &fname,
+                                         &security_info_wanted,
+                                         &py_session,
+                                         &service);
+       if (!ret) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(
+                       PyExc_TypeError,
+                       "Expected auth_session_info for "
+                       "session_info argument got %s",
+                       pytalloc_get_name(py_session));
+               return NULL;
+       }
+
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       status = get_nt_acl_conn(frame, fname, conn, security_info_wanted, &sd);
+       PyErr_NTSTATUS_IS_ERR_RAISE(status);
+
+       py_sd = py_return_ndr_struct("samba.dcerpc.security", "descriptor", sd, sd);
+
+       TALLOC_FREE(frame);
+
+       return py_sd;
+}
+
+/*
+  set the posix (or similar) ACL on a file
+ */
+static PyObject *py_smbd_set_sys_acl(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+       const char * const kwnames[] = {
+               "fname",
+               "acl_type",
+               "acl",
+               "session_info",
+               "service",
+               NULL
+       };
+       TALLOC_CTX *frame = talloc_stackframe();
+       int ret;
+       char *fname, *service = NULL;
+       PyObject *py_acl;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       struct smb_acl_t *acl;
+       int acl_type;
+       connection_struct *conn;
+
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siOO|z",
+                                        discard_const_p(char *, kwnames),
+                                        &fname,
+                                        &acl_type,
+                                        &py_acl,
+                                        &py_session,
+                                        &service)) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_acl, "samba.dcerpc.smb_acl", "t")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       acl = pytalloc_get_type(py_acl, struct smb_acl_t);
+
+       ret = set_sys_acl_conn(fname, acl_type, acl, conn);
+       if (ret != 0) {
+               TALLOC_FREE(frame);
+               errno = ret;
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+
+       TALLOC_FREE(frame);
+       Py_RETURN_NONE;
+}
+
+/*
+  Return the posix (or similar) ACL on a file
+ */
+static PyObject *py_smbd_get_sys_acl(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+       const char * const kwnames[] = {
+               "fname",
+               "acl_type",
+               "session_info",
+               "service",
+               NULL
+       };
+       char *fname;
+       PyObject *py_acl;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       struct smb_acl_t *acl;
+       int acl_type;
+       TALLOC_CTX *frame = talloc_stackframe();
+       connection_struct *conn;
+       char *service = NULL;
+       struct smb_filename *smb_fname = NULL;
+
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO|z",
+                                        discard_const_p(char *, kwnames),
+                                        &fname,
+                                        &acl_type,
+                                        &py_session,
+                                        &service)) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       smb_fname = synthetic_smb_fname_split(frame,
+                                       fname,
+                                       lp_posix_pathnames());
+       if (smb_fname == NULL) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       acl = SMB_VFS_SYS_ACL_GET_FILE( conn, smb_fname, acl_type, frame);
+       if (!acl) {
+               TALLOC_FREE(frame);
+               return PyErr_SetFromErrno(PyExc_OSError);
+       }
+
+       py_acl = py_return_ndr_struct("samba.dcerpc.smb_acl", "t", acl, acl);
+
+       TALLOC_FREE(frame);
+
+       return py_acl;
+}
+
+static PyObject *py_smbd_mkdir(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+       const char * const kwnames[] = {
+               "fname",
+               "session_info",
+               "service",
+               NULL
+       };
+       char *fname, *service = NULL;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct connection_struct *conn = NULL;
+       struct smb_filename *smb_fname = NULL;
+       int ret;
+       mode_t saved_umask;
+
+       if (!PyArg_ParseTupleAndKeywords(args,
+                                        kwargs,
+                                        "sO|z",
+                                        discard_const_p(char *,
+                                                        kwnames),
+                                        &fname,
+                                        &py_session,
+                                        &service)) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       smb_fname = synthetic_smb_fname(talloc_tos(),
+                                       fname,
+                                       NULL,
+                                       NULL,
+                                       0,
+                                       lp_posix_pathnames() ?
+                                       SMB_FILENAME_POSIX_PATH : 0);
+
+       if (smb_fname == NULL) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       /* we want total control over the permissions on created files,
+          so set our umask to 0 */
+       saved_umask = umask(0);
+
+       ret = SMB_VFS_MKDIRAT(conn,
+                       conn->cwd_fsp,
+                       smb_fname,
+                       00755);
+
+       umask(saved_umask);
+
+       if (ret == -1) {
+               DBG_ERR("mkdirat error=%d (%s)\n", errno, strerror(errno));
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       TALLOC_FREE(frame);
+       Py_RETURN_NONE;
+}
+
+
+/*
+  Create an empty file
+ */
+static PyObject *py_smbd_create_file(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+       const char * const kwnames[] = {
+               "fname",
+               "session_info",
+               "service",
+               NULL
+       };
+       char *fname, *service = NULL;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct connection_struct *conn = NULL;
+       struct files_struct *fsp = NULL;
+       NTSTATUS status;
+
+       if (!PyArg_ParseTupleAndKeywords(args,
+                                        kwargs,
+                                        "sO|z",
+                                        discard_const_p(char *,
+                                                        kwnames),
+                                        &fname,
+                                        &py_session,
+                                        &service)) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       if (!py_check_dcerpc_type(py_session,
+                                 "samba.dcerpc.auth",
+                                 "session_info")) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+       session_info = pytalloc_get_type(py_session,
+                                        struct auth_session_info);
+       if (session_info == NULL) {
+               PyErr_Format(PyExc_TypeError,
+                            "Expected auth_session_info for session_info argument got %s",
+                            pytalloc_get_name(py_session));
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       conn = get_conn_tos(service, session_info);
+       if (!conn) {
+               TALLOC_FREE(frame);
+               return NULL;
+       }
+
+       status = init_files_struct(frame,
+                                  fname,
+                                  conn,
+                                  O_CREAT|O_EXCL|O_RDWR,
+                                  &fsp);
+       if (!NT_STATUS_IS_OK(status)) {
+               DBG_ERR("init_files_struct failed: %s\n",
+                       nt_errstr(status));
+       }
+
+       TALLOC_FREE(frame);
+       Py_RETURN_NONE;
+}
+
+
 static PyMethodDef py_smbd_methods[] = {
        { "have_posix_acls",
-               (PyCFunction)py_smbd_have_posix_acls, METH_VARARGS,
+               (PyCFunction)py_smbd_have_posix_acls, METH_NOARGS,
                NULL },
        { "set_simple_acl",
-               (PyCFunction)py_smbd_set_simple_acl, METH_VARARGS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_simple_acl),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "set_nt_acl",
-               (PyCFunction)py_smbd_set_nt_acl, METH_VARARGS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_nt_acl),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
-       { NULL }
+       { "get_nt_acl",
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_get_nt_acl),
+               METH_VARARGS|METH_KEYWORDS,
+               NULL },
+       { "get_sys_acl",
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_get_sys_acl),
+               METH_VARARGS|METH_KEYWORDS,
+               NULL },
+       { "set_sys_acl",
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_sys_acl),
+               METH_VARARGS|METH_KEYWORDS,
+               NULL },
+       { "chown",
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_chown),
+               METH_VARARGS|METH_KEYWORDS,
+               NULL },
+       { "unlink",
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_unlink),
+               METH_VARARGS|METH_KEYWORDS,
+               NULL },
+       { "mkdir",
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_mkdir),
+               METH_VARARGS|METH_KEYWORDS,
+               NULL },
+       { "create_file",
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_create_file),
+               METH_VARARGS|METH_KEYWORDS,
+               NULL },
+       {0}
 };
 
 void initsmbd(void);
-void initsmbd(void)
-{
-       PyObject *m;
 
-       m = Py_InitModule3("smbd", py_smbd_methods,
-                          "Python bindings for the smbd file server.");
-       if (m == NULL)
-               return;
+static struct PyModuleDef moduledef = {
+    PyModuleDef_HEAD_INIT,
+    .m_name = "smbd",
+    .m_doc = "Python bindings for the smbd file server.",
+    .m_size = -1,
+    .m_methods = py_smbd_methods,
+};
+
+MODULE_INIT_FUNC(smbd)
+{
+       PyObject *m = NULL;
 
+       m = PyModule_Create(&moduledef);
+       return m;
 }