sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

pysmbd: remove explicit talloc_stackframe() from get_conn() and name it get_conn_tos()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2018-05-24 16:16:19 +02:00
parent 539f51f0df
commit 67ea594843
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source3/smbd/pysmbd.c
View File

@ -43,33 +43,29 @@ static int conn_free_wrapper(connection_struct *conn)
return 0; return 0;
}; };
static connection_struct *get_conn(TALLOC_CTX *mem_ctx, const char *service) static connection_struct *get_conn_tos(const char *service)
{ {
connection_struct *conn; connection_struct *conn;
TALLOC_CTX *frame = talloc_stackframe();
int snum = -1; int snum = -1;
NTSTATUS status; NTSTATUS status;
if (!posix_locking_init(false)) { if (!posix_locking_init(false)) {
PyErr_NoMemory(); PyErr_NoMemory();
TALLOC_FREE(frame);
return NULL; return NULL;
} }
if (service) { if (service) {
snum = lp_servicenumber(service); snum = lp_servicenumber(service);
if (snum == -1) { if (snum == -1) {
TALLOC_FREE(frame);
PyErr_SetString(PyExc_RuntimeError, "unknown service"); PyErr_SetString(PyExc_RuntimeError, "unknown service");
return NULL; return NULL;
} }
} }
status = create_conn_struct(mem_ctx, NULL, NULL, &conn, snum, "/", status = create_conn_struct(talloc_tos(), NULL, NULL, &conn, snum, "/",
NULL); NULL);
PyErr_NTSTATUS_IS_ERR_RAISE(status); PyErr_NTSTATUS_IS_ERR_RAISE(status);
TALLOC_FREE(frame);
/* Ignore read-only and share restrictions */ /* Ignore read-only and share restrictions */
conn->read_only = false; conn->read_only = false;
conn->share_access = SEC_RIGHTS_FILE_ALL; conn->share_access = SEC_RIGHTS_FILE_ALL;
@ -395,7 +391,7 @@ static PyObject *py_smbd_set_simple_acl(PyObject *self, PyObject *args, PyObject
return NULL; return NULL;
} }
conn = get_conn(frame, service); conn = get_conn_tos(service);
if (!conn) { if (!conn) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;
@ -436,7 +432,7 @@ static PyObject *py_smbd_chown(PyObject *self, PyObject *args, PyObject *kwargs)
frame = talloc_stackframe(); frame = talloc_stackframe();
conn = get_conn(frame, service); conn = get_conn_tos(service);
if (!conn) { if (!conn) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;
@ -495,7 +491,7 @@ static PyObject *py_smbd_unlink(PyObject *self, PyObject *args, PyObject *kwargs
return NULL; return NULL;
} }
conn = get_conn(frame, service); conn = get_conn_tos(service);
if (!conn) { if (!conn) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;
@ -561,7 +557,7 @@ static PyObject *py_smbd_set_nt_acl(PyObject *self, PyObject *args, PyObject *kw
return NULL; return NULL;
} }
conn = get_conn(frame, service); conn = get_conn_tos(service);
if (!conn) { if (!conn) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;
@ -596,7 +592,7 @@ static PyObject *py_smbd_get_nt_acl(PyObject *self, PyObject *args, PyObject *kw
return NULL; return NULL;
} }
conn = get_conn(frame, service); conn = get_conn_tos(service);
if (!conn) { if (!conn) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;
@ -638,7 +634,7 @@ static PyObject *py_smbd_set_sys_acl(PyObject *self, PyObject *args, PyObject *k
return NULL; return NULL;
} }
conn = get_conn(frame, service); conn = get_conn_tos(service);
if (!conn) { if (!conn) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;
@ -679,7 +675,7 @@ static PyObject *py_smbd_get_sys_acl(PyObject *self, PyObject *args, PyObject *k
return NULL; return NULL;
} }
conn = get_conn(frame, service); conn = get_conn_tos(service);
if (!conn) { if (!conn) {
TALLOC_FREE(frame); TALLOC_FREE(frame);
return NULL; return NULL;