From be33f4c611d37ebba59ff618033dc73601339ad1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 23 Dec 2007 23:54:30 -0600 Subject: r26576: Allow the static module loading code to be used for the Python modules. Simplify the way module initialization functions are handled. (This used to be commit ba8be2dfc0de4434c798663336b81f7f95cde520) --- source4/scripting/python/modules.c | 45 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 source4/scripting/python/modules.c (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c new file mode 100644 index 0000000000..6a766f3412 --- /dev/null +++ b/source4/scripting/python/modules.c @@ -0,0 +1,45 @@ +/* + Unix SMB/CIFS implementation. + Samba utility functions + Copyright (C) Jelmer Vernooij 2007 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include "includes.h" +#include +#include "build.h" + +extern void init_ldb(void); +extern void init_security(void); +extern void init_registry(void); +extern void init_param(void); +extern void init_misc(void); +extern void init_ldb(void); +extern void init_auth(void); +extern void init_credentials(void); +extern void init_tdb(void); +extern void init_dcerpc(void); +extern void init_events(void); +extern void inituuid(void); + +static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; + +void py_load_samba_modules(void) +{ + int i; + for (i = 0; i < ARRAY_SIZE(py_modules); i++) { + PyImport_ExtendInittab(&py_modules[i]); + } +} -- cgit From e8bca8dd71c9bb64b84f6a74632a46a661be0d97 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 25 Dec 2007 16:36:36 -0600 Subject: r26594: Add right paths to the Python sys.path setting so we don't have to set magic environment variables when running from the build directory. (This used to be commit 2d2674ad79330f59210408fd03e859afc01f40f2) --- source4/scripting/python/modules.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 6a766f3412..2a88870660 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -43,3 +43,11 @@ void py_load_samba_modules(void) PyImport_ExtendInittab(&py_modules[i]); } } + +void py_update_path(const char *bindir) +{ + char *newpath; + asprintf(&newpath, "%s:%s/python:%s/../scripting/python", Py_GetPath(), bindir, bindir); + PySys_SetPath(newpath); + free(newpath); +} -- cgit From 68b698270481f2b033046dcd6e0a293c1cdaf838 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 28 Dec 2007 16:25:27 -0600 Subject: r26624: libnet/python: Use standard function for constructing context, allow overriding credentials. (This used to be commit a5fb3caedefaf5387e3a384d060272f11a3b4b99) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 2a88870660..6094cb49f4 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -33,6 +33,7 @@ extern void init_tdb(void); extern void init_dcerpc(void); extern void init_events(void); extern void inituuid(void); +extern void init_net(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From 1548d8d2be2a1012549f626d504070272bb51c9e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 3 Jan 2008 21:45:18 -0600 Subject: r26658: pidl: Register Python modules. (This used to be commit f47044aacc8eb6df856524744ab87bee997bae6d) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 6094cb49f4..55df51d881 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -34,6 +34,7 @@ extern void init_dcerpc(void); extern void init_events(void); extern void inituuid(void); extern void init_net(void); +extern void initecho(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From e42322848b81a36528a0af88138acb3ec997bf01 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Jan 2008 13:26:21 +0100 Subject: python: Start building winreg module. (This used to be commit f1a9fad83cee7754304b3422aa273d5f64868e40) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 55df51d881..5e53aadb94 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -35,6 +35,7 @@ extern void init_events(void); extern void inituuid(void); extern void init_net(void); extern void initecho(void); +extern void initwinreg(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From fa5397fbeda759ac66fc5d0a6bdfb60a070a7962 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Jan 2008 16:11:58 +0100 Subject: python: Build epmapper module. (This used to be commit 6cb78c7634de0f9ab327583844d7860d384356eb) --- source4/scripting/python/modules.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 5e53aadb94..d8a5fdeeae 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -36,6 +36,9 @@ extern void inituuid(void); extern void init_net(void); extern void initecho(void); extern void initwinreg(void); +extern void initepmapper(void); +extern void initinitshutdown(void); +static void initdcerpc_misc(void) {} static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From a896c8940ca372808c0725bc4f2725f6cb8467b8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Jan 2008 16:48:27 +0100 Subject: python: Enable python bindings for samr and lsa interfaces. (This used to be commit 3dfcefd8ac640ef1539185f19f7414fbcea9e741) --- source4/scripting/python/modules.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index d8a5fdeeae..8c5115efca 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -39,6 +39,9 @@ extern void initwinreg(void); extern void initepmapper(void); extern void initinitshutdown(void); static void initdcerpc_misc(void) {} +extern void initmgmt(void); +extern void initatsvc(void); +extern void initsamr(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From d28eb21a984a733e8f1de51170e41ae7c879f7e9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Jan 2008 18:59:11 +0100 Subject: python: Compile security module, handle uint. (This used to be commit dee64344fb13aaed38a550ebb4048d0fa526d5b6) --- source4/scripting/python/modules.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 8c5115efca..1728f166bd 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -42,6 +42,8 @@ static void initdcerpc_misc(void) {} extern void initmgmt(void); extern void initatsvc(void); extern void initsamr(void); +extern void initsecurity(void); +extern void initlsa(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From 2aa8cbca8baf1159544c2f3c0ce316da03035d71 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Jan 2008 19:49:52 +0100 Subject: 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) --- source4/scripting/python/modules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/scripting/python/modules.c') 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 }; -- cgit From 506f6432882804ed62fd3b8c1ddc2a4ac80fa08d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Jan 2008 20:08:04 +0100 Subject: python: Compile in svcctl Python bindings. (This used to be commit 567099b66d0369715f8e0a083a5ce160faaf4da2) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index c953e9866c..dc6e79fe1a 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -44,6 +44,7 @@ extern void initatsvc(void); extern void initsamr(void); static void initdcerpc_security(void) {} extern void initlsa(void); +extern void initsvcctl(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From d869de531c9f6b81c7eca43c3bfaab294c14cab1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 14 Jan 2008 20:14:53 +0100 Subject: python: Enable building of the wkssvc python bindings. (This used to be commit 7a00d48a478be84e9f38c5e6cb57739063d0d613) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index dc6e79fe1a..b2dd50b507 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -45,6 +45,7 @@ extern void initsamr(void); static void initdcerpc_security(void) {} extern void initlsa(void); extern void initsvcctl(void); +extern void initwkssvc(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From 42a793107e79624644ddfcac960b23eae3362002 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 20 Jan 2008 18:04:19 +0100 Subject: python: Fix init functions. (This used to be commit 4b057b9bffcef9ecc61fe016746f5ce6f17f6d06) --- source4/scripting/python/modules.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index b2dd50b507..fff981e941 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -46,6 +46,8 @@ static void initdcerpc_security(void) {} extern void initlsa(void); extern void initsvcctl(void); extern void initwkssvc(void); +extern void init_libcli_nbt(void); +extern void init_libcli_smb(void); static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES }; -- cgit From 21f5f4d4409e5a7076194639570f11ec32cf3257 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 25 Jan 2008 12:16:13 +0100 Subject: python: Give precedence to Samba's syspath over the already set system one. (This used to be commit f3ebaf0a0c0b881da28063c69bb6306f6aa1c774) --- source4/scripting/python/modules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index fff981e941..2ecad20b8e 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -62,7 +62,7 @@ void py_load_samba_modules(void) void py_update_path(const char *bindir) { char *newpath; - asprintf(&newpath, "%s:%s/python:%s/../scripting/python", Py_GetPath(), bindir, bindir); + asprintf(&newpath, "%s/python:%s/../scripting/python:%s", bindir, bindir, Py_GetPath()); PySys_SetPath(newpath); free(newpath); } -- cgit From 2bf39edc9d0abf3306bd25b9c40d88aceb029be7 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 8 Mar 2008 15:28:12 +0100 Subject: Push SOVERSION and VERSION out of perl code. (This used to be commit 0ba8ac6a14c62ff9edfe9f0bf43b8a7406b85291) --- source4/scripting/python/modules.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 2ecad20b8e..2c10a35c60 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -19,7 +19,6 @@ #include "includes.h" #include -#include "build.h" extern void init_ldb(void); extern void init_security(void); -- cgit From 57bf8d2e33c69c8a642070c4c4ba8c00681e42cc Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 8 Apr 2008 02:48:54 +0200 Subject: Add Python bindings for DFS. (This used to be commit 4319971ccb42618a3298a5f26f63fa4c9b255849) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 2ecad20b8e..eccf556ab1 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -35,6 +35,7 @@ extern void init_events(void); extern void inituuid(void); extern void init_net(void); extern void initecho(void); +extern void initdfs(void); extern void initwinreg(void); extern void initepmapper(void); extern void initinitshutdown(void); -- cgit From f253c3ad91d66aeb594e8088c462257277748263 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 8 Apr 2008 03:18:43 +0200 Subject: Add python bindings for unixinfo. (This used to be commit 068c2f858a0c7e325cb8a1f2ca36e32b31fe1f77) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index eccf556ab1..603c1df21c 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -47,6 +47,7 @@ static void initdcerpc_security(void) {} extern void initlsa(void); extern void initsvcctl(void); extern void initwkssvc(void); +extern void initunixinfo(void); extern void init_libcli_nbt(void); extern void init_libcli_smb(void); -- cgit From 5cf6c42658755f0a126a5bd6cdd9f215779b75a8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 8 Apr 2008 03:23:53 +0200 Subject: Add python bindings for drsuapi. (This used to be commit ba3f0312f0dda47fb16ed9b8eee3750b209e0dad) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index 603c1df21c..ba85994636 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -36,6 +36,7 @@ extern void inituuid(void); extern void init_net(void); extern void initecho(void); extern void initdfs(void); +extern void initdrsuapi(void); extern void initwinreg(void); extern void initepmapper(void); extern void initinitshutdown(void); -- cgit From 8db14bf26b96f47b8f937f6016d18d947b68467e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 8 Apr 2008 05:16:07 +0200 Subject: Add manually written Python binding for libnet_Join. (This used to be commit 374654b43d9f9e8381991cedc433ce410a914f7a) --- source4/scripting/python/modules.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index ba85994636..6cd975c1a9 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -42,6 +42,7 @@ extern void initepmapper(void); extern void initinitshutdown(void); static void initdcerpc_misc(void) {} extern void initmgmt(void); +extern void initnet(void); extern void initatsvc(void); extern void initsamr(void); static void initdcerpc_security(void) {} -- cgit From 6267dd78539863a5ec75b6cadba39184a2efc9b5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 10 May 2008 20:59:17 +0200 Subject: Clean up some git merges gone wrong. (This used to be commit 42eb6b33462228467e65a51bbf624c481802b090) --- source4/scripting/python/modules.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'source4/scripting/python/modules.c') diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c index cbff14c708..0fe15b2fda 100644 --- a/source4/scripting/python/modules.c +++ b/source4/scripting/python/modules.c @@ -39,12 +39,10 @@ extern void initdrsuapi(void); extern void initwinreg(void); extern void initepmapper(void); extern void initinitshutdown(void); -static void initdcerpc_misc(void) {} extern void initmgmt(void); extern void initnet(void); extern void initatsvc(void); extern void initsamr(void); -static void initdcerpc_security(void) {} extern void initlsa(void); extern void initsvcctl(void); extern void initwkssvc(void); -- cgit