s4-messaging: Pass the loadparm context, not just the messaging path

This will allow the TDB layer to get at the lp_ctx for tdb options.

Andrew Bartlett

1 files changed, 14 insertions, 13 deletions

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 4f90db59f2..d9ad3790f9 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -64,13 +64,14 @@ typedef struct {
 static PyObject *py_imessaging_connect(PyTypeObject *self, PyObject *args, PyObject *kwargs)
 {
 	struct tevent_context *ev;
-	const char *kwnames[] = { "own_id", "messaging_path", NULL };
+	const char *kwnames[] = { "own_id", "lp_ctx", NULL };
 	PyObject *own_id = Py_None;
-	const char *imessaging_path = NULL;
+	PyObject *py_lp_ctx = Py_None;
 	imessaging_Object *ret;
+	struct loadparm_context *lp_ctx;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|Oz:connect", 
-		discard_const_p(char *, kwnames), &own_id, &imessaging_path)) {
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OO:connect", 
+		discard_const_p(char *, kwnames), &own_id, &py_lp_ctx)) {
 		return NULL;
 	}
 
@@ -80,15 +81,15 @@ static PyObject *py_imessaging_connect(PyTypeObject *self, PyObject *args, PyObj
 
 	ret->mem_ctx = talloc_new(NULL);
 
-	ev = s4_event_context_init(ret->mem_ctx);
-
-	if (imessaging_path == NULL) {
-		imessaging_path = lpcfg_imessaging_path(ret->mem_ctx,
-								   py_default_loadparm_context(ret->mem_ctx));
-	} else {
-		imessaging_path = talloc_strdup(ret->mem_ctx, imessaging_path);
+	lp_ctx = lpcfg_from_py_object(ret->mem_ctx, py_lp_ctx);
+	if (lp_ctx == NULL) {
+		PyErr_SetString(PyExc_RuntimeError, "imessaging_connect unable to interpret loadparm_context");
+		talloc_free(ret->mem_ctx);
+		return NULL;
 	}
 
+	ev = s4_event_context_init(ret->mem_ctx);
+
 	if (own_id != Py_None) {
 		struct server_id server_id;
 
@@ -96,12 +97,12 @@ static PyObject *py_imessaging_connect(PyTypeObject *self, PyObject *args, PyObj
 			return NULL;
 
 		ret->msg_ctx = imessaging_init(ret->mem_ctx,
-					       imessaging_path,
+					       lp_ctx,
 					       server_id,
 					       ev, true);
 	} else {
 		ret->msg_ctx = imessaging_client_init(ret->mem_ctx,
-						      imessaging_path,
+						      lp_ctx,
 						      ev);
 	}