Changeset 745 for trunk/server/source4/param/provision.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/param/provision.c (modified) (10 diffs)

trunk/server/source4/param/provision.c

@@ -19 +19 @@
 */
 
+#include <Python.h>
+#include <ldb.h>
+#include <pyldb.h>
 #include "includes.h"
-#include "auth/auth.h"
-#include "lib/ldb_wrap.h"
-#include "ldb/include/ldb.h"
-#include "ldb_errors.h"
-#include "libcli/raw/libcliraw.h"
 #include "librpc/ndr/libndr.h"
-
-#include "param/param.h"
 #include "param/provision.h"
 #include "param/secrets.h"
-#include <Python.h>
 #include "lib/talloc/pytalloc.h"
-#include "librpc/rpc/pyrpc.h"
 #include "scripting/python/modules.h"
-#include "lib/ldb/pyldb.h"
 #include "param/pyparam.h"
+#include "dynconfig/dynconfig.h"
 
 static PyObject *provision_module(void)
@@ -43 +37 @@
                 return NULL;
         return PyImport_Import(name);
+}
+
+static PyObject *schema_module(void)
+{
+        PyObject *name = PyString_FromString("samba.schema");
+        if (name == NULL)
+                return NULL;
+        return PyImport_Import(name);
+}
+
+static PyObject *ldb_module(void)
+{
+        PyObject *name = PyString_FromString("ldb");
+        if (name == NULL)
+                return NULL;
+        return PyImport_Import(name);
+}
+
+static PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx)
+{
+        PyLdbObject *ret;
+        PyObject *ldb_mod = ldb_module();
+        PyTypeObject *ldb_ctx_type;
+        if (ldb_mod == NULL)
+                return NULL;
+
+        ldb_ctx_type = (PyTypeObject *)PyObject_GetAttrString(ldb_mod, "Ldb");
+
+        ret = (PyLdbObject *)ldb_ctx_type->tp_alloc(ldb_ctx_type, 0);
+        if (ret == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+        }
+        ret->mem_ctx = talloc_new(NULL);
+        ret->ldb_ctx = talloc_reference(ret->mem_ctx, ldb_ctx);
+        return (PyObject *)ret;
 }
 
@@ -50 +80 @@
 {
         const char *configfile;
-        PyObject *provision_mod, *provision_dict, *provision_fn, *py_result, *parameters;
+        PyObject *provision_mod, *provision_dict, *provision_fn, *py_result, *parameters, *py_lp_ctx;
         
         DEBUG(0,("Provision for Become-DC test using python\n"));
 
-        py_load_samba_modules();
         Py_Initialize();
-        py_update_path("bin"); /* FIXME: Can't assume this is always the case */
+        py_update_path(); /* Put the samba path at the start of sys.path */
 
         provision_mod = provision_module();
@@ -88 +117 @@
                 settings->invocation_id == NULL?"None":GUID_string(mem_ctx, settings->invocation_id)));
 
-        DEBUG(0,("Pathes under targetdir[%s]\n",
+        DEBUG(0,("Paths under targetdir[%s]\n",
                  settings->targetdir));
         parameters = PyDict_New();
 
-        configfile = lp_configfile(lp_ctx);
+        configfile = lpcfg_configfile(lp_ctx);
         if (configfile != NULL) {
                 PyDict_SetItemString(parameters, "smbconf", 
@@ -103 +132 @@
                 PyDict_SetItemString(parameters, "targetdir", 
                                                          PyString_FromString(settings->targetdir));
-        PyDict_SetItemString(parameters, "setup_dir", 
-                             PyString_FromString("setup"));
         PyDict_SetItemString(parameters, "hostname", 
                                                  PyString_FromString(settings->netbios_name));
@@ -154 +181 @@
 
         /* FIXME paths */
-        result->lp_ctx = lp_from_py_object(PyObject_GetAttrString(py_result, "lp"));
+        py_lp_ctx = PyObject_GetAttrString(py_result, "lp");
+        if (py_lp_ctx == NULL) {
+                DEBUG(0, ("Missing 'lp' attribute"));
+                return NT_STATUS_UNSUCCESSFUL;
+        }
+        result->lp_ctx = lpcfg_from_py_object(mem_ctx, py_lp_ctx);
         result->samdb = PyLdb_AsLdbContext(PyObject_GetAttrString(py_result, "samdb"));
 
         return NT_STATUS_OK;
 }
-
-extern void initldb(void);
 
 static PyObject *py_dom_sid_FromSid(struct dom_sid *sid)
@@ -191 +221 @@
 
         /* Open the secrets database */
-        ldb = secrets_db_connect(tmp_mem, event_ctx, lp_ctx);
+        ldb = secrets_db_connect(tmp_mem, lp_ctx);
         if (!ldb) {
                 *error_string
@@ -210 +240 @@
         }
 
-        py_load_samba_modules();
         Py_Initialize();
-        py_update_path("bin"); /* FIXME: Can't assume this is always the case */
-        initldb();
+        py_update_path(); /* Put the samba path at the start of sys.path */
         provision_mod = provision_module();
 
@@ -248 +276 @@
         PyDict_SetItemString(parameters, "domain", 
                              PyString_FromString(settings->domain_name));
-        PyDict_SetItemString(parameters, "domain", 
-                             PyString_FromString(settings->domain_name));
-        PyDict_SetItemString(parameters, "realm", 
-                             PyString_FromString(settings->realm));
+        if (settings->realm != NULL) {
+                PyDict_SetItemString(parameters, "realm",
+                                     PyString_FromString(settings->realm));
+        }
         PyDict_SetItemString(parameters, "machinepass", 
                              PyString_FromString(settings->machine_password));
@@ -301 +329 @@
         return NT_STATUS_UNSUCCESSFUL;
 }
+
+
+struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
+                                         DATA_BLOB *override_prefixmap)
+{
+        PyObject *schema_mod, *schema_dict, *schema_fn, *py_result, *parameters;
+        
+        Py_Initialize();
+        py_update_path(); /* Put the samba path at the start of sys.path */
+
+        schema_mod = schema_module();
+
+        if (schema_mod == NULL) {
+                PyErr_Print();
+                DEBUG(0, ("Unable to import schema Python module.\n"));
+                return NULL;
+        }
+
+        schema_dict = PyModule_GetDict(schema_mod);
+
+        if (schema_dict == NULL) {
+                DEBUG(0, ("Unable to get dictionary for schema module\n"));
+                return NULL;
+        }
+
+        schema_fn = PyDict_GetItemString(schema_dict, "ldb_with_schema");
+        if (schema_fn == NULL) {
+                PyErr_Print();
+                DEBUG(0, ("Unable to get schema_get_ldb function\n"));
+                return NULL;
+        }
+        
+        parameters = PyDict_New();
+
+        if (override_prefixmap) {
+                PyDict_SetItemString(parameters, "override_prefixmap",
+                                     PyString_FromStringAndSize((const char *)override_prefixmap->data,
+                                                                override_prefixmap->length));
+        }
+
+        py_result = PyEval_CallObjectWithKeywords(schema_fn, NULL, parameters);
+
+        Py_DECREF(parameters);
+
+        if (py_result == NULL) {
+                PyErr_Print();
+                PyErr_Clear();
+                return NULL;
+        }
+
+        return PyLdb_AsLdbContext(PyObject_GetAttrString(py_result, "ldb"));
+}