diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-22 04:03:55 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-22 04:03:55 +0100 |
| commit | 2396d8d613eed8ab76358056da5fcaf68c71fbf4 (patch) | |
| tree | cad195b95e996ce87e39205f754a9460162ad36d | |
| parent | a6bd295229cf1a245e2ced83ac4e10941207c526 (diff) | |
| download | samba-2396d8d613eed8ab76358056da5fcaf68c71fbf4.tar.gz samba-2396d8d613eed8ab76358056da5fcaf68c71fbf4.tar.bz2 samba-2396d8d613eed8ab76358056da5fcaf68c71fbf4.zip | |
Use consistent names for dcerpc python modules; fixes messaging test.
| -rw-r--r-- | source4/lib/messaging/pymessaging.c | 8 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index ad8f955466..7a5fdb34bf 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 8fe4bb5ee0..7a543e923c 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 |