summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-14 19:49:52 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-14 19:53:08 +0100
commit2aa8cbca8baf1159544c2f3c0ce316da03035d71 (patch)
tree0ed740be3bbb2ba5d7fcb8c591b04fdf87fb46fb
parent001b2435f0a47f75f82a32f2ccead2759596a09d (diff)
downloadsamba-2aa8cbca8baf1159544c2f3c0ce316da03035d71.tar.gz
samba-2aa8cbca8baf1159544c2f3c0ce316da03035d71.tar.bz2
samba-2aa8cbca8baf1159544c2f3c0ce316da03035d71.zip
python: Work around the fact that there are two "security" modules now.
This well demonstrates the fact we need hierarchy. (This used to be commit df7e3498824e27f8a6d61b8b6f52577eab248d2c)
-rw-r--r--source4/librpc/config.mk2
-rw-r--r--source4/scripting/python/modules.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index cda57bedcf..ddb07dc6e2 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -629,5 +629,5 @@ PRIVATE_DEPENDENCIES = dcerpc_samr
OBJ_FILES = gen_ndr/py_lsa.o
PRIVATE_DEPENDENCIES = RPC_NDR_LSA
-[PYTHON::python_security]
+[PYTHON::python_dcerpc_security]
OBJ_FILES = gen_ndr/py_security.o
diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 1728f166bd..c953e9866c 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -42,7 +42,7 @@ static void initdcerpc_misc(void) {}
extern void initmgmt(void);
extern void initatsvc(void);
extern void initsamr(void);
-extern void initsecurity(void);
+static void initdcerpc_security(void) {}
extern void initlsa(void);
static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };