From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 22 Dec 2008 03:03:55 +0000 (+0100)
Subject: Use consistent names for dcerpc python modules; fixes messaging test.
X-Git-Tag: samba-4.0.0alpha6~430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2396d8d613eed8ab76358056da5fcaf68c71fbf4;p=thirdparty%2Fsamba.git

Use consistent names for dcerpc python modules; fixes messaging test.
---

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index ad8f955466f..7a5fdb34bff 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -541,8 +541,12 @@ static bool irpc_AddNdrRpcMethods(PyTypeObject *ifacetype, const struct PyNdrRpc
 
 void initmessaging(void)
 {
-	extern void initirpc(void);
 	PyObject *mod;
+	PyObject *dep_irpc;
+
+	dep_irpc = PyImport_ImportModule("samba.dcerpc.irpc");
+	if (dep_irpc == NULL)
+		return;
 
 	if (PyType_Ready(&irpc_ClientConnectionType) < 0)
 		return;
@@ -560,8 +564,6 @@ void initmessaging(void)
 	if (mod == NULL)
 		return;
 
-	initirpc();
-
 	Py_INCREF((PyObject *)&irpc_ClientConnectionType);
 	PyModule_AddObject(mod, "ClientConnection", (PyObject *)&irpc_ClientConnectionType);
 
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 8fe4bb5ee06..7a543e923c6 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -683,7 +683,7 @@ PRIVATE_DEPENDENCIES = dcerpc_atsvc PYTALLOC param swig_credentials  python_dcer
 python_atsvc_OBJ_FILES = ../librpc/gen_ndr/py_atsvc.o
 
 [PYTHON::python_dcerpc_nbt]
-LIBRARY_REALNAME = samba/nbt.$(SHLIBEXT)
+LIBRARY_REALNAME = samba/dcerpc/nbt.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = NDR_NBT PYTALLOC param swig_credentials python_dcerpc python_dcerpc_misc python_dcerpc_security
 
 python_dcerpc_nbt_OBJ_FILES = ../librpc/gen_ndr/py_nbt.o
@@ -725,7 +725,7 @@ PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO PYTALLOC param swig_credentials python_d
 python_unixinfo_OBJ_FILES = ../librpc/gen_ndr/py_unixinfo.o
 
 [PYTHON::python_irpc]
-LIBRARY_REALNAME = samba/irpc.$(SHLIBEXT)
+LIBRARY_REALNAME = samba/dcerpc/irpc.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = RPC_NDR_IRPC PYTALLOC param swig_credentials python_dcerpc_security python_dcerpc_misc python_dcerpc python_dcerpc_nbt
 
 python_irpc_OBJ_FILES = $(gen_ndrsrcdir)/py_irpc.o