diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:55:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-19 23:55:45 +0100 |
| commit | 759a3bcc88230c5232b748bb8f5a0c6e0cce128c (patch) | |
| tree | 25c15bb606cf573ac217f82b2110166a45520734 /source4/param/provision.c | |
| parent | 9617a3945b804bf2d1409285df2a7add12690063 (diff) | |
| parent | 04bef7fe2ab689a9ab569d5581034e0c02237771 (diff) | |
| download | samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.gz samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.tar.bz2 samba-759a3bcc88230c5232b748bb8f5a0c6e0cce128c.zip | |
Merge branch 'pyregistry' of git://git.samba.org/jelmer/samba
Conflicts:
source4/lib/ldb/ldb_wrap.c
Diffstat (limited to 'source4/param/provision.c')
| -rw-r--r-- | source4/param/provision.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/param/provision.c b/source4/param/provision.c index 0e54acf9e4..b207cf6145 100644 --- a/source4/param/provision.c +++ b/source4/param/provision.c @@ -27,13 +27,13 @@ #include "param/provision.h" #include <Python.h> #include "scripting/python/modules.h" +#include "lib/ldb/pyldb.h" NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, struct provision_settings *settings, struct provision_result *result) { extern struct loadparm_context *lp_from_py_object(PyObject *py_obj); - struct ldb_context *ldb_context_from_py_object(PyObject *py_obj); PyObject *provision_mod, *provision_dict, *provision_fn, *py_result, *parameters; DEBUG(0,("Provision for Become-DC test using python\n")); @@ -133,7 +133,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, /* FIXME paths */ result->lp_ctx = lp_from_py_object(PyObject_GetAttrString(py_result, "lp")); - result->samdb = ldb_context_from_py_object(PyObject_GetAttrString(py_result, "samdb")); + result->samdb = PyLdb_AsLdbContext(PyObject_GetAttrString(py_result, "samdb")); return NT_STATUS_OK; } |