Changeset 988 for vendor/current/source4/param/provision.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/param/provision.c (modified) (7 diffs)

vendor/current/source4/param/provision.c

@@ -26 +26 @@
 #include "param/provision.h"
 #include "param/secrets.h"
-#include "lib/talloc/pytalloc.h"
-#include "scripting/python/modules.h"
+#include <pytalloc.h>
+#include "python/modules.h"
 #include "param/pyparam.h"
 #include "dynconfig/dynconfig.h"
@@ -168 +168 @@
         PyDict_SetItemString(parameters, "debuglevel", PyInt_FromLong(DEBUGLEVEL));
 
+        PyDict_SetItemString(parameters, "use_ntvfs", PyInt_FromLong(settings->use_ntvfs));
+
         py_result = PyEval_CallObjectWithKeywords(provision_fn, NULL, parameters);
 
@@ -187 +189 @@
         }
         result->lp_ctx = lpcfg_from_py_object(mem_ctx, py_lp_ctx);
-        result->samdb = PyLdb_AsLdbContext(PyObject_GetAttrString(py_result, "samdb"));
+        result->samdb = pyldb_Ldb_AsLdbContext(PyObject_GetAttrString(py_result, "samdb"));
 
         return NT_STATUS_OK;
@@ -204 +206 @@
                 return NULL;
 
-        return py_talloc_reference((PyTypeObject *)dom_sid_Type, sid);
+        return pytalloc_reference((PyTypeObject *)dom_sid_Type, sid);
 }
 
@@ -331 +333 @@
 
 
-struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
+struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx,
+                                         struct loadparm_context *lp_ctx,
+                                         const char *schema_dn,
                                          DATA_BLOB *override_prefixmap)
 {
@@ -362 +366 @@
         
         parameters = PyDict_New();
+
+        if (schema_dn) {
+                PyDict_SetItemString(parameters, "schemadn",
+                                     PyString_FromString(schema_dn));
+        }
 
         if (override_prefixmap) {
@@ -379 +388 @@
         }
 
-        return PyLdb_AsLdbContext(PyObject_GetAttrString(py_result, "ldb"));
-}
+        return pyldb_Ldb_AsLdbContext(PyObject_GetAttrString(py_result, "ldb"));
+}