diff options
| -rw-r--r-- | source4/librpc/ndr/py_security.c | 5 | ||||
| -rw-r--r-- | source4/librpc/ndr/py_security.h | 23 | ||||
| -rw-r--r-- | source4/param/config.mk | 2 | ||||
| -rw-r--r-- | source4/param/provision.c | 37 |
4 files changed, 30 insertions, 37 deletions
diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c index 1b185a51b5..02dc059f05 100644 --- a/source4/librpc/ndr/py_security.c +++ b/source4/librpc/ndr/py_security.c @@ -23,11 +23,6 @@ #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None #endif -PyObject *py_dom_sid_FromSid(struct dom_sid *sid) -{ - return py_talloc_reference(&dom_sid_Type, sid); -} - static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods) { PyObject *dict; diff --git a/source4/librpc/ndr/py_security.h b/source4/librpc/ndr/py_security.h deleted file mode 100644 index 9d200faf8e..0000000000 --- a/source4/librpc/ndr/py_security.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Samba utility functions - Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -#include "libcli/security/security.h" - -/* a lone prototype for this function, because it's python */ -PyObject *py_dom_sid_FromSid(struct dom_sid *sid); diff --git a/source4/param/config.mk b/source4/param/config.mk index 45eb836bb4..6e5290b64d 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -13,7 +13,7 @@ PUBLIC_HEADERS += param/param.h PC_FILES += $(paramsrcdir)/samba-hostconfig.pc [SUBSYSTEM::PROVISION] -PRIVATE_DEPENDENCIES = LIBPYTHON pyldb pyparam_util python_dcerpc_security +PRIVATE_DEPENDENCIES = LIBPYTHON pyldb pyparam_util PROVISION_OBJ_FILES = $(paramsrcdir)/provision.o $(param_OBJ_FILES) diff --git a/source4/param/provision.c b/source4/param/provision.c index 355af794d8..8a522e40a9 100644 --- a/source4/param/provision.c +++ b/source4/param/provision.c @@ -1,7 +1,7 @@ /* Unix SMB/CIFS implementation. Samba utility functions - Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008 + Copyright (C) Jelmer Vernooij <jelmer@samba.org> 2008-2009 Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005 This program is free software; you can redistribute it and/or modify @@ -35,7 +35,6 @@ #include "scripting/python/modules.h" #include "lib/ldb/pyldb.h" #include "param/pyparam.h" -#include "librpc/ndr/py_security.h" NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, struct provision_settings *settings, @@ -155,6 +154,21 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, extern void initldb(void); extern void initsecurity(void); +static PyObject *py_dom_sid_FromSid(struct dom_sid *sid) +{ + PyObject *mod_security, *dom_sid_Type; + + mod_security = PyImport_ImportModule("samba.dcerpc.security"); + if (mod_security == NULL) + return NULL; + + dom_sid_Type = PyObject_GetAttrString(mod_security, "dom_sid"); + if (dom_sid_Type == NULL) + return NULL; + + return py_talloc_reference((PyTypeObject *)dom_sid_Type, sid); +} + NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, struct tevent_context *event_ctx, struct provision_store_self_join_settings *settings, @@ -237,6 +251,10 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context PyString_FromString(settings->netbios_name)); py_sid = py_dom_sid_FromSid(settings->domain_sid); + if (py_sid == NULL) { + Py_DECREF(parameters); + goto failure; + } PyDict_SetItemString(parameters, "domainsid", py_sid); @@ -252,12 +270,7 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context Py_DECREF(parameters); if (py_result == NULL) { - ldb_transaction_cancel(ldb); - talloc_free(tmp_mem); - - PyErr_Print(); - PyErr_Clear(); - return NT_STATUS_UNSUCCESSFUL; + goto failure; } ret = ldb_transaction_commit(ldb); @@ -272,4 +285,12 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context talloc_free(tmp_mem); return NT_STATUS_OK; + +failure: + ldb_transaction_cancel(ldb); + talloc_free(tmp_mem); + + PyErr_Print(); + PyErr_Clear(); + return NT_STATUS_UNSUCCESSFUL; } |