diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-11-01 15:38:37 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-11-01 18:55:19 +1100 |
| commit | 28c1e4d3eb3162c0177085bae753102994a35846 (patch) | |
| tree | 60f1b1ee601024af24723fa0170b8e5994b6e754 /source4/auth | |
| parent | 4404b4c700270c7607d7b8d792ab23ce1d080463 (diff) | |
| download | samba-28c1e4d3eb3162c0177085bae753102994a35846.tar.gz samba-28c1e4d3eb3162c0177085bae753102994a35846.tar.bz2 samba-28c1e4d3eb3162c0177085bae753102994a35846.zip | |
s4-modules: get rid of the remaining static prototypes for modules
the waf build now generates the prototype declarations for us
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/gensec/gensec.c | 13 | ||||
| -rw-r--r-- | source4/auth/ntlm/auth.c | 9 |
2 files changed, 4 insertions, 18 deletions
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c index 606e4f15bd..0cb0d3d476 100644 --- a/source4/auth/gensec/gensec.c +++ b/source4/auth/gensec/gensec.c @@ -1394,23 +1394,14 @@ bool gensec_setting_bool(struct gensec_settings *settings, const char *mechanism return lpcfg_parm_bool(settings->lp_ctx, NULL, mechanism, name, default_value); } -#ifndef STATIC_gensec_MODULES -#define STATIC_gensec_MODULES NULL -#endif - /* initialise the GENSEC subsystem */ _PUBLIC_ NTSTATUS gensec_init(struct loadparm_context *lp_ctx) { static bool initialized = false; - extern NTSTATUS gensec_sasl_init(void); - extern NTSTATUS gensec_krb5_init(void); - extern NTSTATUS gensec_schannel_init(void); - extern NTSTATUS gensec_spnego_init(void); - extern NTSTATUS gensec_gssapi_init(void); - extern NTSTATUS gensec_ntlmssp_init(void); - +#define _MODULE_PROTO(init) extern NTSTATUS init(void); + STATIC_gensec_MODULES_PROTO; init_module_fn static_init[] = { STATIC_gensec_MODULES }; init_module_fn *shared_init; diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 46fd8877d2..f7de0201b6 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -632,13 +632,8 @@ const struct auth_critical_sizes *auth_interface_version(void) _PUBLIC_ NTSTATUS auth_init(void) { static bool initialized = false; - extern NTSTATUS auth_developer_init(void); - extern NTSTATUS auth_winbind_init(void); - extern NTSTATUS auth_anonymous_init(void); - extern NTSTATUS auth_unix_init(void); - extern NTSTATUS auth_sam_init(void); - extern NTSTATUS auth_server_init(void); - +#define _MODULE_PROTO(init) extern NTSTATUS init(void); + STATIC_auth_MODULES_PROTO; init_module_fn static_init[] = { STATIC_auth_MODULES }; if (initialized) return NT_STATUS_OK; |