From 8d966fac41ff88f8c26c221fb03da4f9afba5897 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 2 Jun 2009 15:00:41 +0200
Subject: Fix unresolved symbol in python messaging module.

---
 source4/lib/messaging/config.mk     |  2 +-
 source4/lib/messaging/pymessaging.c |  4 +---
 source4/param/pyparam.c             |  9 ---------
 source4/param/pyparam.h             |  1 +
 source4/param/pyparam_util.c        | 11 +++++++++++
 5 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'source4')

diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index b5b1e6d1e3..1cdbbc6d76 100644
--- 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 96981895b6..33ccf782e9 100644
--- 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 e32cfa0523..d8dabe3458 100644
--- 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 1cda8f1dba..48885c053b 100644
--- 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 0dc7c7fd13..9e4a6cdf64 100644
--- 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;
+}
+
+
-- 
cgit