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

Check for PyString_FromString being NULL.

Browse Source
This commit is contained in:
Jelmer Vernooij 2009-09-23 14:22:36 +02:00
parent c5615211d4
commit adf66e75c0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/param/provision.c
View File

@ -36,6 +36,14 @@
#include "lib/ldb/pyldb.h" #include "lib/ldb/pyldb.h"
#include "param/pyparam.h" #include "param/pyparam.h"
static PyObject *provision_module(void)
{
PyObject *name = PyString_FromString("samba.provision");
if (name == NULL)
return NULL;
return PyImport_Import(name);
}
NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
struct provision_settings *settings, struct provision_settings *settings,
struct provision_result *result) struct provision_result *result)
@ -49,7 +57,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
Py_Initialize(); Py_Initialize();
py_update_path("bin"); /* FIXME: Can't assume this is always the case */ py_update_path("bin"); /* FIXME: Can't assume this is always the case */
provision_mod = PyImport_Import(PyString_FromString("samba.provision")); provision_mod = provision_module();
if (provision_mod == NULL) { if (provision_mod == NULL) {
PyErr_Print(); PyErr_Print();
@ -152,7 +160,6 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
} }
extern void initldb(void); extern void initldb(void);
extern void initsecurity(void);
static PyObject *py_dom_sid_FromSid(struct dom_sid *sid) static PyObject *py_dom_sid_FromSid(struct dom_sid *sid)
{ {
@ -206,8 +213,7 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
Py_Initialize(); Py_Initialize();
py_update_path("bin"); /* FIXME: Can't assume this is always the case */ py_update_path("bin"); /* FIXME: Can't assume this is always the case */
initldb(); initldb();
initsecurity(); provision_mod = provision_module();
provision_mod = PyImport_Import(PyString_FromString("samba.provision"));
if (provision_mod == NULL) { if (provision_mod == NULL) {
PyErr_Print(); PyErr_Print();