X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source3%2Fsmbd%2Fpysmbd.c;h=63fc5d68c33ff525e27d425cda983cdc4be0fb6a;hb=e6f3631eba863e6dda007b4e2d9a3b7ef3d49f35;hp=5e8691a8f050931555ea9a874f4ac00578447aa1;hpb=e146fe5ef96c1522175a8e81db15d1e8879e5652;p=nivanova%2Fsamba-autobuild%2F.git

diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index 5e8691a8f05..63fc5d68c33 100644
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -23,9 +23,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <Python.h>
 #include "includes.h"
 #include "smbd/smbd.h"
-#include <Python.h>
 #include "libcli/util/pyerrors.h"
 #include "librpc/rpc/pyrpc_util.h"
 #include <pytalloc.h>
@@ -36,80 +36,88 @@ 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)
+static int conn_free_wrapper(connection_struct *conn)
+{
+	conn_free(conn);
+	return 0;
+};
+
+static connection_struct *get_conn(TALLOC_CTX *mem_ctx, const char *service)
 {
 	connection_struct *conn;
-	NTSTATUS status = NT_STATUS_OK;
-	int ret;
-	mode_t saved_umask;
+	TALLOC_CTX *frame = talloc_stackframe();
+	int snum = -1;
+	NTSTATUS status;
 
-	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();
+		TALLOC_FREE(frame);
+		return NULL;
 	}
 
-	if (!(conn->params = talloc(conn, struct share_params))) {
-		DEBUG(0,("set_sys_acl_no_snum: talloc() failed!\n"));
-		TALLOC_FREE(conn);
-		return NT_STATUS_NO_MEMORY;
+	if (service) {
+		snum = lp_servicenumber(service);
+		if (snum == -1) {
+			TALLOC_FREE(frame);
+			PyErr_SetString(PyExc_RuntimeError, "unknown service");
+			return NULL;
+		}
 	}
 
-	/* we want total control over the permissions on created files,
-	   so set our umask to 0 */
-	saved_umask = umask(0);
+	status = create_conn_struct(mem_ctx, NULL, NULL, &conn, snum, "/",
+					    NULL);
+	PyErr_NTSTATUS_IS_ERR_RAISE(status);
 
-	conn->params->service = -1;
+	TALLOC_FREE(frame);
+	/* Ignore read-only and share restrictions */
+	conn->read_only = false;
+	conn->share_access = SEC_RIGHTS_FILE_ALL;
+	talloc_set_destructor(conn, conn_free_wrapper);
+	return conn;
+}
+
+static int set_sys_acl_conn(const char *fname,
+				 SMB_ACL_TYPE_T acltype,
+				 SMB_ACL_T theacl, connection_struct *conn)
+{
+	int ret;
+	struct smb_filename *smb_fname = NULL;
+	mode_t saved_umask;
 
-	set_conn_connectpath(conn, "/");
+	TALLOC_CTX *frame = talloc_stackframe();
 
-	smbd_vfs_init(conn);
+	/* we want total control over the permissions on created files,
+	   so set our umask to 0 */
+	saved_umask = umask(0);
 
-	ret = SMB_VFS_SYS_ACL_SET_FILE( conn, fname, acltype, theacl);
-	if (ret != 0) {
-		status = map_nt_error_from_unix_common(ret);
-		DEBUG(0,("set_sys_acl_no_snum: SMB_VFS_SYS_ACL_SET_FILE "
-			 "returned zero.\n"));
+	smb_fname = synthetic_smb_fname_split(frame,
+					fname,
+					lp_posix_pathnames());
+	if (smb_fname == NULL) {
+		TALLOC_FREE(frame);
+		umask(saved_umask);
+		return -1;
 	}
 
-	umask(saved_umask);
+	ret = SMB_VFS_SYS_ACL_SET_FILE( conn, smb_fname, acltype, theacl);
 
-	conn_free(conn);
+	umask(saved_umask);
 
-	return status;
+	TALLOC_FREE(frame);
+	return ret;
 }
 
-static NTSTATUS set_nt_acl_no_snum(const char *fname,
-				   uint32 security_info_sent, const struct security_descriptor *sd)
+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();
-	connection_struct *conn;
 	NTSTATUS status = NT_STATUS_OK;
 	files_struct *fsp;
 	struct smb_filename *smb_fname = NULL;
-	int flags;
+	int flags, ret;
 	mode_t saved_umask;
 
-	if (!posix_locking_init(false)) {
-		TALLOC_FREE(frame);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	conn = talloc_zero(frame, connection_struct);
-	if (conn == NULL) {
-		TALLOC_FREE(frame);
-		DEBUG(0, ("talloc failed\n"));
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	if (!(conn->params = talloc(conn, struct share_params))) {
-		DEBUG(0,("set_nt_acl_no_snum: talloc() failed!\n"));
-		TALLOC_FREE(frame);
-		return NT_STATUS_NO_MEMORY;
-	}
-
 	fsp = talloc_zero(frame, struct files_struct);
 	if (fsp == NULL) {
 		TALLOC_FREE(frame);
@@ -126,18 +134,13 @@ static NTSTATUS set_nt_acl_no_snum(const char *fname,
 	   so set our umask to 0 */
 	saved_umask = umask(0);
 
-	conn->params->service = -1;
-
-	set_conn_connectpath(conn, "/");
-
-	smbd_vfs_init(conn);
-
-	status = create_synthetic_smb_fname_split(fsp, fname, NULL,
-						  &smb_fname);
-	if (!NT_STATUS_IS_OK(status)) {
+	smb_fname = synthetic_smb_fname_split(fsp,
+					fname,
+					lp_posix_pathnames());
+	if (smb_fname == NULL) {
 		TALLOC_FREE(frame);
 		umask(saved_umask);
-		return status;
+		return NT_STATUS_NO_MEMORY;
 	}
 
 	fsp->fsp_name = smb_fname;
@@ -160,6 +163,29 @@ static NTSTATUS set_nt_acl_no_snum(const char *fname,
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
+	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) ));
+		TALLOC_FREE(frame);
+		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->print_file = NULL;
+	fsp->modified = False;
+	fsp->sent_oplock_break = NO_BREAK_SENT;
+	fsp->is_directory = S_ISDIR(smb_fname->st.st_ex_mode);
+
 	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)));
@@ -174,12 +200,46 @@ static NTSTATUS set_nt_acl_no_snum(const char *fname,
 	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,
+					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(conn,
+				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)));
+	}
+
+	TALLOC_FREE(frame);
+
+	return status;
+}
+
 
 static SMB_ACL_T make_simple_acl(gid_t gid, mode_t chmod_mode)
 {
 	TALLOC_CTX *frame = talloc_stackframe();
 
-	mode_t mode = SMB_ACL_READ|SMB_ACL_WRITE;
+	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;
@@ -278,27 +338,40 @@ static SMB_ACL_T make_simple_acl(gid_t gid, mode_t chmod_mode)
 /*
   set a simple ACL on a file, as a test
  */
-static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args)
+static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-	NTSTATUS status;
-	char *fname;
+	const char * const kwnames[] = { "fname", "mode", "gid", "service", NULL };
+	char *fname, *service = NULL;
+	int ret;
 	int mode, gid = -1;
 	SMB_ACL_T acl;
 	TALLOC_CTX *frame;
+	connection_struct *conn;
 
-	if (!PyArg_ParseTuple(args, "si|i", &fname, &mode, &gid))
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si|iz",
+					 discard_const_p(char *, kwnames),
+					 &fname, &mode, &gid, &service))
 		return NULL;
 
 	acl = make_simple_acl(gid, mode);
 
 	frame = talloc_stackframe();
 
-	status = set_sys_acl_no_snum(fname, SMB_ACL_TYPE_ACCESS, acl);
+	conn = get_conn(frame, service);
+	if (!conn) {
+		return NULL;
+	}
+
+	ret = set_sys_acl_conn(fname, SMB_ACL_TYPE_ACCESS, acl, conn);
 	TALLOC_FREE(acl);
 
-	TALLOC_FREE(frame);
+	if (ret != 0) {
+		TALLOC_FREE(frame);
+		errno = ret;
+		return PyErr_SetFromErrno(PyExc_OSError);
+	}
 
-	PyErr_NTSTATUS_IS_ERR_RAISE(status);
+	TALLOC_FREE(frame);
 
 	Py_RETURN_NONE;
 }
@@ -306,30 +379,27 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args)
 /*
   chown a file
  */
-static PyObject *py_smbd_chown(PyObject *self, PyObject *args)
+static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)
 {
+	const char * const kwnames[] = { "fname", "uid", "gid", "service", NULL };
 	connection_struct *conn;
-	NTSTATUS status = NT_STATUS_OK;
 	int ret;
 
-	char *fname;
+	char *fname, *service = NULL;
 	int uid, gid;
 	TALLOC_CTX *frame;
 	mode_t saved_umask;
+	struct smb_filename *smb_fname = NULL;
 
-	if (!PyArg_ParseTuple(args, "sii", &fname, &uid, &gid))
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sii|z",
+					 discard_const_p(char *, kwnames),
+					 &fname, &uid, &gid, &service))
 		return NULL;
 
 	frame = talloc_stackframe();
 
-	conn = talloc_zero(frame, connection_struct);
-	if (conn == NULL) {
-		PyErr_NoMemory();
-		return NULL;
-	}
-
-	if (!(conn->params = talloc(conn, struct share_params))) {
-		PyErr_NoMemory();
+	conn = get_conn(frame, service);
+	if (!conn) {
 		return NULL;
 	}
 
@@ -337,98 +407,85 @@ static PyObject *py_smbd_chown(PyObject *self, PyObject *args)
 	   so set our umask to 0 */
 	saved_umask = umask(0);
 
-	conn->params->service = -1;
-
-	set_conn_connectpath(conn, "/");
-
-	smbd_vfs_init(conn);
+	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);
+		TALLOC_FREE(frame);
+		errno = ENOMEM;
+		return PyErr_SetFromErrno(PyExc_OSError);
+	}
 
-	ret = SMB_VFS_CHOWN( conn, fname, uid, gid);
+	ret = SMB_VFS_CHOWN(conn, smb_fname, uid, gid);
 	if (ret != 0) {
-		status = map_nt_error_from_unix_common(errno);
-		DEBUG(0,("chown returned failure: %s\n", strerror(errno)));
+		umask(saved_umask);
+		TALLOC_FREE(frame);
+		errno = ret;
+		return PyErr_SetFromErrno(PyExc_OSError);
 	}
 
 	umask(saved_umask);
 
-	conn_free(conn);
-
 	TALLOC_FREE(frame);
 
-	PyErr_NTSTATUS_IS_ERR_RAISE(status);
-
 	Py_RETURN_NONE;
 }
 
 /*
-  chown a file
+  unlink a file
  */
-static PyObject *py_smbd_unlink(PyObject *self, PyObject *args)
+static PyObject *py_smbd_unlink(PyObject *self, PyObject *args, PyObject *kwargs)
 {
+	const char * const kwnames[] = { "fname", "service", NULL };
 	connection_struct *conn;
-	NTSTATUS status = NT_STATUS_OK;
 	int ret;
 	struct smb_filename *smb_fname = NULL;
-	char *fname;
-	int uid, gid;
+	char *fname, *service = NULL;
 	TALLOC_CTX *frame;
-	mode_t saved_umask;
-
-	if (!PyArg_ParseTuple(args, "s", &fname))
-		return NULL;
 
 	frame = talloc_stackframe();
 
-	conn = talloc_zero(frame, connection_struct);
-	if (conn == NULL) {
-		PyErr_NoMemory();
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|z",
+					 discard_const_p(char *, kwnames),
+					 &fname, &service)) {
+		TALLOC_FREE(frame);
 		return NULL;
 	}
 
-	if (!(conn->params = talloc(conn, struct share_params))) {
-		PyErr_NoMemory();
+	conn = get_conn(frame, service);
+	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);
-
-	conn->params->service = -1;
-
-	set_conn_connectpath(conn, "/");
-
-	smbd_vfs_init(conn);
-
-	status = create_synthetic_smb_fname_split(frame, fname, NULL,
-						  &smb_fname);
-	if (!NT_STATUS_IS_OK(status)) {
+	smb_fname = synthetic_smb_fname_split(frame,
+					fname,
+					lp_posix_pathnames());
+	if (smb_fname == NULL) {
 		TALLOC_FREE(frame);
-		umask(saved_umask);
-		PyErr_NTSTATUS_IS_ERR_RAISE(status);
+		return PyErr_NoMemory();
 	}
 
 	ret = SMB_VFS_UNLINK(conn, smb_fname);
 	if (ret != 0) {
-		status = map_nt_error_from_unix_common(errno);
-		DEBUG(0,("unlink returned failure: %s\n", strerror(errno)));
+		TALLOC_FREE(frame);
+		errno = ret;
+		return PyErr_SetFromErrno(PyExc_OSError);
 	}
 
-	umask(saved_umask);
-
-	conn_free(conn);
-
 	TALLOC_FREE(frame);
 
-	PyErr_NTSTATUS_IS_ERR_RAISE(status);
-
 	Py_RETURN_NONE;
 }
 
 /*
   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)
 {
 #ifdef HAVE_POSIX_ACLS
 	return PyBool_FromLong(true);
@@ -440,24 +497,41 @@ static PyObject *py_smbd_have_posix_acls(PyObject *self, PyObject *args)
 /*
   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", "service", NULL };
 	NTSTATUS status;
-	char *fname;
+	char *fname, *service = NULL;
 	int security_info_sent;
 	PyObject *py_sd;
 	struct security_descriptor *sd;
+	connection_struct *conn;
+	TALLOC_CTX *frame;
+
+	frame = talloc_stackframe();
 
-	if (!PyArg_ParseTuple(args, "siO", &fname, &security_info_sent, &py_sd))
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+					 "siO|z", discard_const_p(char *, kwnames),
+					 &fname, &security_info_sent, &py_sd, &service)) {
+		TALLOC_FREE(frame);
 		return NULL;
+	}
 
 	if (!py_check_dcerpc_type(py_sd, "samba.dcerpc.security", "descriptor")) {
+		TALLOC_FREE(frame);
+		return NULL;
+	}
+
+	conn = get_conn(frame, service);
+	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;
@@ -466,22 +540,35 @@ static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args)
 /*
   Return the NT ACL on a file
  */
-static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args)
+static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-	char *fname;
+	const char * const kwnames[] = { "fname", "security_info_wanted", "service", NULL };
+	char *fname, *service = NULL;
 	int security_info_wanted;
 	PyObject *py_sd;
 	struct security_descriptor *sd;
 	TALLOC_CTX *tmp_ctx = talloc_new(NULL);
+	connection_struct *conn;
+	NTSTATUS status;
+
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si|z", discard_const_p(char *, kwnames),
+					 &fname, &security_info_wanted, &service)) {
+		TALLOC_FREE(tmp_ctx);
+		return NULL;
+	}
 
-	if (!PyArg_ParseTuple(args, "si", &fname, &security_info_wanted))
+	conn = get_conn(tmp_ctx, service);
+	if (!conn) {
+		TALLOC_FREE(tmp_ctx);
 		return NULL;
+	}
 
-	sd = get_nt_acl_no_snum(tmp_ctx, fname, security_info_wanted);
+	status = get_nt_acl_conn(tmp_ctx, 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(tmp_ctx);
+	TALLOC_FREE(tmp_ctx);
 
 	return py_sd;
 }
@@ -489,109 +576,131 @@ static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args)
 /*
   set the posix (or similar) ACL on a file
  */
-static PyObject *py_smbd_set_sys_acl(PyObject *self, PyObject *args)
+static PyObject *py_smbd_set_sys_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-	NTSTATUS status;
-	char *fname;
+	const char * const kwnames[] = { "fname", "acl_type", "acl", "service", NULL };
+	TALLOC_CTX *frame = talloc_stackframe();
+	int ret;
+	char *fname, *service = NULL;
 	PyObject *py_acl;
 	struct smb_acl_t *acl;
 	int acl_type;
+	connection_struct *conn;
 
-	if (!PyArg_ParseTuple(args, "siO", &fname, &acl_type, &py_acl))
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "siO|z",
+					 discard_const_p(char *, kwnames),
+					 &fname, &acl_type, &py_acl, &service)) {
+		TALLOC_FREE(frame);
 		return NULL;
+	}
 
 	if (!py_check_dcerpc_type(py_acl, "samba.dcerpc.smb_acl", "t")) {
+		TALLOC_FREE(frame);
+		return NULL;
+	}
+
+	conn = get_conn(frame, service);
+	if (!conn) {
+		TALLOC_FREE(frame);
 		return NULL;
 	}
 
 	acl = pytalloc_get_type(py_acl, struct smb_acl_t);
 
-	status = set_sys_acl_no_snum(fname, acl_type, acl);
-	PyErr_NTSTATUS_IS_ERR_RAISE(status);
+	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)
+static PyObject *py_smbd_get_sys_acl(PyObject *self, PyObject *args, PyObject *kwargs)
 {
+	const char * const kwnames[] = { "fname", "acl_type", "service", NULL };
 	char *fname;
 	PyObject *py_acl;
 	struct smb_acl_t *acl;
 	int acl_type;
 	TALLOC_CTX *frame = talloc_stackframe();
+	TALLOC_CTX *tmp_ctx = talloc_new(NULL);
 	connection_struct *conn;
-	NTSTATUS status = NT_STATUS_OK;
+	char *service = NULL;
+	struct smb_filename *smb_fname = NULL;
 
-	if (!PyArg_ParseTuple(args, "si", &fname, &acl_type)) {
-		TALLOC_FREE(frame);
+	if (!tmp_ctx) {
+		PyErr_NoMemory();
 		return NULL;
 	}
 
-	conn = talloc_zero(frame, connection_struct);
-	if (conn == NULL) {
-		DEBUG(0, ("talloc failed\n"));
-		PyErr_NoMemory();
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si|z",
+					 discard_const_p(char *, kwnames),
+					 &fname, &acl_type, &service)) {
 		TALLOC_FREE(frame);
+		TALLOC_FREE(tmp_ctx);
 		return NULL;
 	}
 
-	if (!(conn->params = talloc(conn, struct share_params))) {
-		DEBUG(0,("get_nt_acl_no_snum: talloc() failed!\n"));
-		PyErr_NoMemory();
+	conn = get_conn(frame, service);
+	if (!conn) {
 		TALLOC_FREE(frame);
+		TALLOC_FREE(tmp_ctx);
 		return NULL;
 	}
 
-	conn->params->service = -1;
-
-	set_conn_connectpath(conn, "/");
-
-	smbd_vfs_init(conn);
-
-	acl = SMB_VFS_SYS_ACL_GET_FILE( conn, fname, acl_type, frame);
+	smb_fname = synthetic_smb_fname_split(frame,
+					fname,
+					lp_posix_pathnames());
+	if (smb_fname == NULL) {
+		TALLOC_FREE(frame);
+		TALLOC_FREE(tmp_ctx);
+		return NULL;
+	}
+	acl = SMB_VFS_SYS_ACL_GET_FILE( conn, smb_fname, acl_type, tmp_ctx);
 	if (!acl) {
 		TALLOC_FREE(frame);
-		status = map_nt_error_from_unix_common(errno);
-		DEBUG(0,("sys_acl_get_file returned NULL: %s\n", strerror(errno)));
-		PyErr_NTSTATUS_IS_ERR_RAISE(status);
+		TALLOC_FREE(tmp_ctx);
+		return PyErr_SetFromErrno(PyExc_OSError);
 	}
 
-	conn_free(conn);
-
 	py_acl = py_return_ndr_struct("samba.dcerpc.smb_acl", "t", acl, acl);
 
 	TALLOC_FREE(frame);
+	TALLOC_FREE(tmp_ctx);
 
 	return py_acl;
 }
 
 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,
+		(PyCFunction)py_smbd_set_simple_acl, METH_VARARGS|METH_KEYWORDS,
 		NULL },
 	{ "set_nt_acl",
-		(PyCFunction)py_smbd_set_nt_acl, METH_VARARGS,
+		(PyCFunction)py_smbd_set_nt_acl, METH_VARARGS|METH_KEYWORDS,
 		NULL },
 	{ "get_nt_acl",
-		(PyCFunction)py_smbd_get_nt_acl, METH_VARARGS,
+		(PyCFunction)py_smbd_get_nt_acl, METH_VARARGS|METH_KEYWORDS,
 		NULL },
 	{ "get_sys_acl",
-		(PyCFunction)py_smbd_get_sys_acl, METH_VARARGS,
+		(PyCFunction)py_smbd_get_sys_acl, METH_VARARGS|METH_KEYWORDS,
 		NULL },
 	{ "set_sys_acl",
-		(PyCFunction)py_smbd_set_sys_acl, METH_VARARGS,
+		(PyCFunction)py_smbd_set_sys_acl, METH_VARARGS|METH_KEYWORDS,
 		NULL },
 	{ "chown",
-		(PyCFunction)py_smbd_chown, METH_VARARGS,
+		(PyCFunction)py_smbd_chown, METH_VARARGS|METH_KEYWORDS,
 		NULL },
 	{ "unlink",
-		(PyCFunction)py_smbd_unlink, METH_VARARGS,
+		(PyCFunction)py_smbd_unlink, METH_VARARGS|METH_KEYWORDS,
 		NULL },
 	{ NULL }
 };