Fix clang 9 missing-field-initializer warnings
[amitay/samba.git] / source3 / smbd / pysmbd.c
index fd0c9fd46a7db5d587fe1cd6356401a675882fe2..9f5663e2e43e1ff9e0373a5d58626488346628ab 100644 (file)
@@ -26,6 +26,7 @@
 #include <Python.h>
 #include "includes.h"
 #include "python/py3compat.h"
+#include "python/modules.h"
 #include "smbd/smbd.h"
 #include "libcli/util/pyerrors.h"
 #include "librpc/rpc/pyrpc_util.h"
@@ -55,6 +56,9 @@ static connection_struct *get_conn_tos(
        struct conn_struct_tos *c = NULL;
        int snum = -1;
        NTSTATUS status;
+       char *cwd = NULL;
+       struct smb_filename cwd_fname = {0};
+       int ret;
 
        if (!posix_locking_init(false)) {
                PyErr_NoMemory();
@@ -79,6 +83,29 @@ static connection_struct *get_conn_tos(
        /* Ignore read-only and share restrictions */
        c->conn->read_only = false;
        c->conn->share_access = SEC_RIGHTS_FILE_ALL;
+
+       /* Provided by libreplace if not present. Always mallocs. */
+       cwd = get_current_dir_name();
+       if (cwd == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
+
+       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(errno);
+               SAFE_FREE(cwd);
+               PyErr_NTSTATUS_IS_ERR_RAISE(status);
+       }
+
+       SAFE_FREE(cwd);
+
        return c->conn;
 }
 
@@ -88,27 +115,19 @@ static int set_sys_acl_conn(const char *fname,
 {
        int ret;
        struct smb_filename *smb_fname = NULL;
-       mode_t saved_umask;
 
        TALLOC_CTX *frame = talloc_stackframe();
 
-       /* we want total control over the permissions on created files,
-          so set our umask to 0 */
-       saved_umask = umask(0);
-
        smb_fname = synthetic_smb_fname_split(frame,
                                        fname,
                                        lp_posix_pathnames());
        if (smb_fname == NULL) {
                TALLOC_FREE(frame);
-               umask(saved_umask);
                return -1;
        }
 
        ret = SMB_VFS_SYS_ACL_SET_FILE( conn, smb_fname, acltype, theacl);
 
-       umask(saved_umask);
-
        TALLOC_FREE(frame);
        return ret;
 }
@@ -135,23 +154,27 @@ static NTSTATUS init_files_struct(TALLOC_CTX *mem_ctx,
        }
        fsp->conn = conn;
 
-       /* we want total control over the permissions on created files,
-          so set our umask to 0 */
-       saved_umask = umask(0);
-
        smb_fname = synthetic_smb_fname_split(fsp,
                                              fname,
                                              lp_posix_pathnames());
        if (smb_fname == NULL) {
-               umask(saved_umask);
                return NT_STATUS_NO_MEMORY;
        }
 
        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);
+
        fsp->fh->fd = SMB_VFS_OPEN(conn, smb_fname, fsp, flags, 00644);
+
+       umask(saved_umask);
+
        if (fsp->fh->fd == -1) {
                int err = errno;
-               umask(saved_umask);
                if (err == ENOENT) {
                        return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                }
@@ -164,20 +187,19 @@ static NTSTATUS init_files_struct(TALLOC_CTX *mem_ctx,
                DEBUG(0,("Error doing fstat on open file %s (%s)\n",
                         smb_fname_str_dbg(smb_fname),
                         strerror(errno) ));
-               umask(saved_umask);
                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->can_lock = True;
-       fsp->can_read = True;
-       fsp->can_write = True;
+       fsp->fsp_flags.can_lock = true;
+       fsp->fsp_flags.can_read = true;
+       fsp->fsp_flags.can_write = true;
        fsp->print_file = NULL;
-       fsp->modified = False;
+       fsp->fsp_flags.modified = false;
        fsp->sent_oplock_break = NO_BREAK_SENT;
-       fsp->is_directory = S_ISDIR(smb_fname->st.st_ex_mode);
+       fsp->fsp_flags.is_directory = S_ISDIR(smb_fname->st.st_ex_mode);
 
        *_fsp = fsp;
 
@@ -240,6 +262,7 @@ static NTSTATUS get_nt_acl_conn(TALLOC_CTX *mem_ctx,
                                        fname,
                                        NULL,
                                        NULL,
+                                       0,
                                        lp_posix_pathnames() ?
                                                SMB_FILENAME_POSIX_PATH : 0);
 
@@ -248,13 +271,15 @@ static NTSTATUS get_nt_acl_conn(TALLOC_CTX *mem_ctx,
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = SMB_VFS_GET_NT_ACL(conn,
+       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)) {
-               DEBUG(0,("get_nt_acl_conn: get_nt_acl returned %s.\n", nt_errstr(status)));
+               DBG_ERR("get_nt_acl_at returned %s.\n",
+                       nt_errstr(status));
        }
 
        TALLOC_FREE(frame);
@@ -402,18 +427,45 @@ static SMB_ACL_T make_simple_acl(TALLOC_CTX *mem_ctx,
  */
 static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname", "mode", "gid", "service", NULL };
+       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, "si|iz",
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO|iz",
                                         discard_const_p(char *, kwnames),
-                                        &fname, &mode, &gid, &service))
+                                        &fname,
+                                        &mode,
+                                        &py_session,
+                                        &gid,
+                                        &service))
+               return NULL;
+
+       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;
+       }
 
        frame = talloc_stackframe();
 
@@ -423,7 +475,7 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args, PyObject
                return NULL;
        }
 
-       conn = get_conn_tos(service, NULL);
+       conn = get_conn_tos(service, session_info);
        if (!conn) {
                TALLOC_FREE(frame);
                return NULL;
@@ -447,56 +499,94 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args, PyObject
  */
 static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname", "uid", "gid", "service", NULL };
+       const char * const kwnames[] = {
+               "fname",
+               "uid",
+               "gid",
+               "session_info",
+               "service",
+               NULL
+       };
        connection_struct *conn;
        int ret;
-
+       NTSTATUS status;
        char *fname, *service = NULL;
+       PyObject *py_session = Py_None;
+       struct auth_session_info *session_info = NULL;
        int uid, gid;
        TALLOC_CTX *frame;
-       mode_t saved_umask;
-       struct smb_filename *smb_fname = NULL;
+       struct files_struct *fsp = NULL;
 
-       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sii|z",
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siiO|z",
                                         discard_const_p(char *, kwnames),
-                                        &fname, &uid, &gid, &service))
+                                        &fname,
+                                        &uid,
+                                        &gid,
+                                        &py_session,
+                                        &service))
+               return NULL;
+
+       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;
+       }
 
        frame = talloc_stackframe();
 
-       conn = get_conn_tos(service, NULL);
+       conn = get_conn_tos(service, session_info);
        if (!conn) {
                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);
+       /* 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);
+       }
 
-       smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       fname,
-                                       NULL,
-                                       NULL,
-                                       lp_posix_pathnames() ?
-                                               SMB_FILENAME_POSIX_PATH : 0);
-       if (smb_fname == NULL) {
-               umask(saved_umask);
+       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);
-               errno = ENOMEM;
-               return PyErr_SetFromErrno(PyExc_OSError);
+               /*
+                * The following macro raises a python
+                * error then returns NULL.
+                */
+               PyErr_NTSTATUS_IS_ERR_RAISE(status);
        }
 
-       ret = SMB_VFS_CHOWN(conn, smb_fname, uid, gid);
+       ret = SMB_VFS_FCHOWN(fsp, uid, gid);
        if (ret != 0) {
-               umask(saved_umask);
+               int saved_errno = errno;
+               SMB_VFS_CLOSE(fsp);
                TALLOC_FREE(frame);
-               errno = ret;
+               errno = saved_errno;
                return PyErr_SetFromErrno(PyExc_OSError);
        }
 
-       umask(saved_umask);
-
+       SMB_VFS_CLOSE(fsp);
        TALLOC_FREE(frame);
 
        Py_RETURN_NONE;
@@ -507,23 +597,48 @@ static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)
  */
 static PyObject *py_smbd_unlink(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname", "service", NULL };
+       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, "s|z",
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO|z",
                                         discard_const_p(char *, kwnames),
-                                        &fname, &service)) {
+                                        &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, NULL);
+       conn = get_conn_tos(service, session_info);
        if (!conn) {
                TALLOC_FREE(frame);
                return NULL;
@@ -537,7 +652,10 @@ static PyObject *py_smbd_unlink(PyObject *self, PyObject *args, PyObject *kwargs
                return PyErr_NoMemory();
        }
 
-       ret = SMB_VFS_UNLINK(conn, smb_fname);
+       ret = SMB_VFS_UNLINKAT(conn,
+                       conn->cwd_fsp,
+                       smb_fname,
+                       0);
        if (ret != 0) {
                TALLOC_FREE(frame);
                errno = ret;
@@ -552,7 +670,8 @@ static PyObject *py_smbd_unlink(PyObject *self, PyObject *args, PyObject *kwargs
 /*
   check if we have ACL support
  */
-static PyObject *py_smbd_have_posix_acls(PyObject *self)
+static PyObject *py_smbd_have_posix_acls(PyObject *self,
+               PyObject *Py_UNUSED(ignored))
 {
 #ifdef HAVE_POSIX_ACLS
        return PyBool_FromLong(true);
@@ -567,8 +686,13 @@ static PyObject *py_smbd_have_posix_acls(PyObject *self)
 static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
        const char * const kwnames[] = {
-               "fname", "security_info_sent", "sd",
-               "service", "session_info", NULL };
+               "fname",
+               "security_info_sent",
+               "sd",
+               "session_info",
+               "service",
+               NULL
+       };
 
        NTSTATUS status;
        char *fname, *service = NULL;
@@ -582,10 +706,13 @@ static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kw
 
        frame = talloc_stackframe();
 
-       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO|zO",
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siOO|z",
                                         discard_const_p(char *, kwnames),
-                                        &fname, &security_info_sent, &py_sd,
-                                        &service, &py_session)) {
+                                        &fname,
+                                        &security_info_sent,
+                                        &py_sd,
+                                        &py_session,
+                                        &service)) {
                TALLOC_FREE(frame);
                return NULL;
        }
@@ -595,21 +722,19 @@ static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kw
                return NULL;
        }
 
-       if (py_session != Py_None) {
-               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) {
-                       PyErr_Format(PyExc_TypeError,
-                                    "Expected auth_session_info for session_info argument got %s",
-                                    talloc_get_name(pytalloc_get_ptr(py_session)));
-                       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);
@@ -632,11 +757,13 @@ static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kw
  */
 static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname",
-                                        "security_info_wanted",
-                                        "service",
-                                        "session_info",
-                                        NULL };
+       const char * const kwnames[] = {
+               "fname",
+               "security_info_wanted",
+               "session_info",
+               "service",
+               NULL
+       };
        char *fname, *service = NULL;
        int security_info_wanted;
        PyObject *py_sd;
@@ -650,34 +777,32 @@ static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args, PyObject *kw
 
        ret = PyArg_ParseTupleAndKeywords(args,
                                          kwargs,
-                                         "si|zO",
+                                         "siO|z",
                                          discard_const_p(char *, kwnames),
                                          &fname,
                                          &security_info_wanted,
-                                         &service,
-                                         &py_session);
+                                         &py_session,
+                                         &service);
        if (!ret) {
                TALLOC_FREE(frame);
                return NULL;
        }
 
-       if (py_session != Py_None) {
-               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) {
-                       PyErr_Format(
-                               PyExc_TypeError,
-                               "Expected auth_session_info for "
-                               "session_info argument got %s",
-                               talloc_get_name(pytalloc_get_ptr(py_session)));
-                       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);
@@ -701,18 +826,31 @@ static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args, PyObject *kw
  */
 static PyObject *py_smbd_set_sys_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname", "acl_type", "acl", "service", NULL };
+       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, "siO|z",
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siOO|z",
                                         discard_const_p(char *, kwnames),
-                                        &fname, &acl_type, &py_acl, &service)) {
+                                        &fname,
+                                        &acl_type,
+                                        &py_acl,
+                                        &py_session,
+                                        &service)) {
                TALLOC_FREE(frame);
                return NULL;
        }
@@ -722,7 +860,23 @@ static PyObject *py_smbd_set_sys_acl(PyObject *self, PyObject *args, PyObject *k
                return NULL;
        }
 
-       conn = get_conn_tos(service, 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;
@@ -746,9 +900,17 @@ static PyObject *py_smbd_set_sys_acl(PyObject *self, PyObject *args, PyObject *k
  */
 static PyObject *py_smbd_get_sys_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname", "acl_type", "service", NULL };
+       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();
@@ -756,14 +918,33 @@ static PyObject *py_smbd_get_sys_acl(PyObject *self, PyObject *args, PyObject *k
        char *service = NULL;
        struct smb_filename *smb_fname = NULL;
 
-       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si|z",
+       if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO|z",
                                         discard_const_p(char *, kwnames),
-                                        &fname, &acl_type, &service)) {
+                                        &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, NULL);
+       conn = get_conn_tos(service, session_info);
        if (!conn) {
                TALLOC_FREE(frame);
                return NULL;
@@ -791,24 +972,50 @@ static PyObject *py_smbd_get_sys_acl(PyObject *self, PyObject *args, PyObject *k
 
 static PyObject *py_smbd_mkdir(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname", "service", NULL };
+       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,
-                                        "s|z",
+                                        "sO|z",
                                         discard_const_p(char *,
                                                         kwnames),
                                         &fname,
+                                        &py_session,
                                         &service)) {
                TALLOC_FREE(frame);
                return NULL;
        }
 
-       conn = get_conn_tos(service, 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;
@@ -818,6 +1025,7 @@ static PyObject *py_smbd_mkdir(PyObject *self, PyObject *args, PyObject *kwargs)
                                        fname,
                                        NULL,
                                        NULL,
+                                       0,
                                        lp_posix_pathnames() ?
                                        SMB_FILENAME_POSIX_PATH : 0);
 
@@ -826,9 +1034,19 @@ static PyObject *py_smbd_mkdir(PyObject *self, PyObject *args, PyObject *kwargs)
                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);
 
-       if (SMB_VFS_MKDIR(conn, smb_fname, 00755) == -1) {
-               DBG_ERR("mkdir error=%d (%s)\n", errno, strerror(errno));
+       umask(saved_umask);
+
+       if (ret == -1) {
+               DBG_ERR("mkdirat error=%d (%s)\n", errno, strerror(errno));
                TALLOC_FREE(frame);
                return NULL;
        }
@@ -843,8 +1061,15 @@ static PyObject *py_smbd_mkdir(PyObject *self, PyObject *args, PyObject *kwargs)
  */
 static PyObject *py_smbd_create_file(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-       const char * const kwnames[] = { "fname", "service", NULL };
+       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;
@@ -852,16 +1077,33 @@ static PyObject *py_smbd_create_file(PyObject *self, PyObject *args, PyObject *k
 
        if (!PyArg_ParseTupleAndKeywords(args,
                                         kwargs,
-                                        "s|z",
+                                        "sO|z",
                                         discard_const_p(char *,
                                                         kwnames),
                                         &fname,
+                                        &py_session,
                                         &service)) {
                TALLOC_FREE(frame);
                return NULL;
        }
 
-       conn = get_conn_tos(service, 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;
@@ -887,33 +1129,42 @@ static PyMethodDef py_smbd_methods[] = {
                (PyCFunction)py_smbd_have_posix_acls, METH_NOARGS,
                NULL },
        { "set_simple_acl",
-               (PyCFunction)py_smbd_set_simple_acl, METH_VARARGS|METH_KEYWORDS,
+               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|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_nt_acl),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "get_nt_acl",
-               (PyCFunction)py_smbd_get_nt_acl, METH_VARARGS|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_get_nt_acl),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "get_sys_acl",
-               (PyCFunction)py_smbd_get_sys_acl, METH_VARARGS|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_get_sys_acl),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "set_sys_acl",
-               (PyCFunction)py_smbd_set_sys_acl, METH_VARARGS|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_set_sys_acl),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "chown",
-               (PyCFunction)py_smbd_chown, METH_VARARGS|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_chown),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "unlink",
-               (PyCFunction)py_smbd_unlink, METH_VARARGS|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_unlink),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "mkdir",
-               (PyCFunction)py_smbd_mkdir, METH_VARARGS|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_mkdir),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
        { "create_file",
-               (PyCFunction)py_smbd_create_file, METH_VARARGS|METH_KEYWORDS,
+               PY_DISCARD_FUNC_SIG(PyCFunction, py_smbd_create_file),
+               METH_VARARGS|METH_KEYWORDS,
                NULL },
-       { NULL }
+       {0}
 };
 
 void initsmbd(void);