Fix unresolved symbol in python messaging module.

diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index b5b1e6d1e3fe3b083b7f78a34491e25200f62726..1cdbbc6d76fb9cab8a746184ea5a8b81a082df59 100644 (file)
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -13,6 +13,6 @@ MESSAGING_OBJ_FILES = $(libmessagingsrcdir)/messaging.o
 
 [PYTHON::python_messaging]
 LIBRARY_REALNAME = samba/messaging.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = MESSAGING LIBEVENTS python_irpc
+PRIVATE_DEPENDENCIES = MESSAGING LIBEVENTS python_irpc pyparam_util
 
 python_messaging_OBJ_FILES = $(libmessagingsrcdir)/pymessaging.o

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 96981895b6089d08a817b8aae43990f1306739df..33ccf782e9cf2bf0e435b965eb8078602ba9f2e4 100644 (file)
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -29,6 +29,7 @@
 #include "lib/events/events.h"
 #include "cluster/cluster.h"
 #include "param/param.h"
+#include "param/pyparam.h"
 
 #ifndef Py_RETURN_NONE
 #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
@@ -37,9 +38,6 @@
 PyAPI_DATA(PyTypeObject) messaging_Type;
 PyAPI_DATA(PyTypeObject) irpc_ClientConnectionType;
 
-/* FIXME: This prototype should be in param/pyparam.h */
-struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx);
-
 /* FIXME: This prototype should be in py_irpc.h, or shared otherwise */
 extern const struct PyNdrRpcMethodDef py_ndr_irpc_methods[];
 

diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index e32cfa052330f5ee563d85b9af83a09ebb80d997..d8dabe345873c80a8ebd4c1b888a909096c90fdd 100644 (file)
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -325,15 +325,6 @@ PyTypeObject PyLoadparmService = {
        .tp_flags = Py_TPFLAGS_DEFAULT,
 };
 
-struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx)
-{
-    struct loadparm_context *ret;
-    ret = loadparm_init(mem_ctx);
-    if (!lp_load_default(ret))
-        return NULL;
-    return ret;
-}
-
 static PyObject *py_default_path(PyObject *self)
 {
     return PyString_FromString(lp_default_path());

diff --git a/source4/param/pyparam.h b/source4/param/pyparam.h
index 1cda8f1dba48ecc2544dae9213d85963d5d9da16..48885c053bb4b0f601fe89e34297d204c3ef106f 100644 (file)
--- a/source4/param/pyparam.h
+++ b/source4/param/pyparam.h
@@ -21,5 +21,6 @@
 #define _PYPARAM_H_
 
 _PUBLIC_ struct loadparm_context *lp_from_py_object(PyObject *py_obj);
+_PUBLIC_ struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx);
 
 #endif /* _PYPARAM_H_ */

diff --git a/source4/param/pyparam_util.c b/source4/param/pyparam_util.c
index 0dc7c7fd134c89418c7a0be490df993d0866f174..9e4a6cdf648171e650ea1d6e6401472c724e33f2 100644 (file)
--- a/source4/param/pyparam_util.c
+++ b/source4/param/pyparam_util.c
@@ -52,3 +52,14 @@ _PUBLIC_ struct loadparm_context *lp_from_py_object(PyObject *py_obj)
 
     return PyLoadparmContext_AsLoadparmContext(py_obj);
 }
+
+struct loadparm_context *py_default_loadparm_context(TALLOC_CTX *mem_ctx)
+{
+    struct loadparm_context *ret;
+    ret = loadparm_init(mem_ctx);
+    if (!lp_load_default(ret))
+        return NULL;
+    return ret;
+}
+
+