sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

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

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-12-22 04:03:55 +01:00
parent a6bd295229
commit 2396d8d613
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/lib/messaging/pymessaging.c
View File

@ -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);

4
source4/librpc/config.mk
View File

@ -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