diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-23 23:54:30 -0600 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-24 01:51:06 -0600 |
| commit | be33f4c611d37ebba59ff618033dc73601339ad1 (patch) | |
| tree | 2d1fdd393172069a89dd5819d614db6a917bc984 /source4/auth | |
| parent | 1ab5bcfb93c9fc7b18d55e6c5995efddf97fea09 (diff) | |
| download | samba-be33f4c611d37ebba59ff618033dc73601339ad1.tar.gz samba-be33f4c611d37ebba59ff618033dc73601339ad1.tar.xz samba-be33f4c611d37ebba59ff618033dc73601339ad1.zip | |
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)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth.c | 2 | ||||
| -rw-r--r-- | source4/auth/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/credentials/config.mk | 2 | ||||
| -rw-r--r-- | source4/auth/gensec/gensec.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c index 918890b3f62..4bfc92e8f9d 100644 --- a/source4/auth/auth.c +++ b/source4/auth/auth.c @@ -516,7 +516,7 @@ NTSTATUS auth_init(void) { static bool initialized = false; - init_module_fn static_init[] = STATIC_auth_MODULES; + init_module_fn static_init[] = { STATIC_auth_MODULES, NULL }; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/source4/auth/config.mk b/source4/auth/config.mk index 3514059cf00..4d111107a97 100644 --- a/source4/auth/config.mk +++ b/source4/auth/config.mk @@ -92,6 +92,6 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL ####################### [PYTHON::swig_auth] -PUBLIC_DEPENDENCIES = auth_system_session LIBPYTHON +PUBLIC_DEPENDENCIES = auth_system_session PRIVATE_DEPENDENCIES = SAMDB SWIG_FILE = auth.i diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index 4c8308d01f4..8d33bdbd554 100644 --- a/source4/auth/credentials/config.mk +++ b/source4/auth/credentials/config.mk @@ -14,5 +14,5 @@ PRIVATE_DEPENDENCIES = \ SECRETS [PYTHON::swig_credentials] -PUBLIC_DEPENDENCIES = CREDENTIALS LIBPYTHON +PUBLIC_DEPENDENCIES = CREDENTIALS SWIG_FILE = credentials.i diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index f055b1a995c..6f7ff91db6c 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -1268,7 +1268,7 @@ NTSTATUS gensec_init(struct loadparm_context *lp_ctx) { static bool initialized = false; - init_module_fn static_init[] = STATIC_gensec_MODULES; + init_module_fn static_init[] = { STATIC_gensec_MODULES, NULL }; init_module_fn *shared_init; if (initialized) return NT_STATUS_OK; |