diff options
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth.h | 2 | ||||
| -rw-r--r-- | source4/auth/ntlm/auth.c | 8 | ||||
| -rw-r--r-- | source4/auth/ntlm/auth_server_service.c | 2 | ||||
| -rw-r--r-- | source4/auth/ntlm/wscript_build | 30 | ||||
| -rw-r--r-- | source4/auth/wscript_build | 8 |
5 files changed, 25 insertions, 25 deletions
diff --git a/source4/auth/auth.h b/source4/auth/auth.h index 10818dc79b..ccc5695a2e 100644 --- a/source4/auth/auth.h +++ b/source4/auth/auth.h @@ -209,7 +209,7 @@ NTSTATUS auth_check_password(struct auth_context *auth_ctx, TALLOC_CTX *mem_ctx, const struct auth_usersupplied_info *user_info, struct auth_user_info_dc **user_info_dc); -NTSTATUS auth_init(void); +NTSTATUS auth4_init(void); NTSTATUS auth_register(const struct auth_operations *ops); NTSTATUS server_service_auth_init(void); NTSTATUS authenticate_username_pw(TALLOC_CTX *mem_ctx, diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c index 1558cfdebe..e2deab78bc 100644 --- a/source4/auth/ntlm/auth.c +++ b/source4/auth/ntlm/auth.c @@ -433,7 +433,7 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char ** int i; struct auth_context *ctx; - auth_init(); + auth4_init(); if (!ev) { DEBUG(0,("auth_context_create: called with out event context\n")); @@ -631,12 +631,12 @@ const struct auth_critical_sizes *auth_interface_version(void) return &critical_sizes; } -_PUBLIC_ NTSTATUS auth_init(void) +_PUBLIC_ NTSTATUS auth4_init(void) { static bool initialized = false; #define _MODULE_PROTO(init) extern NTSTATUS init(void); - STATIC_auth_MODULES_PROTO; - init_module_fn static_init[] = { STATIC_auth_MODULES }; + STATIC_auth4_MODULES_PROTO; + init_module_fn static_init[] = { STATIC_auth4_MODULES }; if (initialized) return NT_STATUS_OK; initialized = true; diff --git a/source4/auth/ntlm/auth_server_service.c b/source4/auth/ntlm/auth_server_service.c index df47117ba4..65b9dc2e45 100644 --- a/source4/auth/ntlm/auth_server_service.c +++ b/source4/auth/ntlm/auth_server_service.c @@ -22,5 +22,5 @@ NTSTATUS server_service_auth_init(void) { - return auth_init(); + return auth4_init(); } diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index b0f519f1c6..615419e5c0 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -1,54 +1,54 @@ #!/usr/bin/env python -bld.SAMBA_MODULE('auth_sam_module', +bld.SAMBA_MODULE('auth4_sam_module', source='auth_sam.c', - subsystem='auth', + subsystem='auth4', init_function='auth_sam_init', - deps='samdb auth_sam ntlm_check samba-hostconfig' + deps='samdb auth4_sam ntlm_check samba-hostconfig' ) -bld.SAMBA_MODULE('auth_anonymous', +bld.SAMBA_MODULE('auth4_anonymous', source='auth_anonymous.c', - subsystem='auth', + subsystem='auth4', init_function='auth_anonymous_init', deps='talloc' ) -bld.SAMBA_MODULE('auth_server', +bld.SAMBA_MODULE('auth4_server', source='auth_server.c', - subsystem='auth', + subsystem='auth4', init_function='auth_server_init', deps='samba-util LIBCLI_SMB CREDENTIALS_NTLM' ) -bld.SAMBA_MODULE('auth_winbind', +bld.SAMBA_MODULE('auth4_winbind', source='auth_winbind.c', - subsystem='auth', + subsystem='auth4', init_function='auth_winbind_init', deps='RPC_NDR_WINBIND MESSAGING wbclient' ) -bld.SAMBA_MODULE('auth_developer', +bld.SAMBA_MODULE('auth4_developer', source='auth_developer.c', - subsystem='auth', + subsystem='auth4', init_function='auth_developer_init', deps='talloc' ) -bld.SAMBA_MODULE('auth_unix', +bld.SAMBA_MODULE('auth4_unix', source='auth_unix.c', - subsystem='auth', + subsystem='auth4', init_function='auth_unix_init', deps='pam PAM_ERRORS LIBTSOCKET' ) -bld.SAMBA_LIBRARY('auth', +bld.SAMBA_LIBRARY('auth4', source='auth.c auth_util.c auth_simple.c', autoproto='auth_proto.h', deps='samba-util security samdb credentials UTIL_TEVENT', @@ -59,7 +59,7 @@ bld.SAMBA_MODULE('service_auth', source='auth_server_service.c', subsystem='service', init_function='server_service_auth_init', - deps='auth', + deps='auth4', internal_module=True ) diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build index 5bb51161f3..d72086e1d9 100644 --- a/source4/auth/wscript_build +++ b/source4/auth/wscript_build @@ -12,13 +12,13 @@ bld.SAMBA_SUBSYSTEM('auth_session', public_deps='credentials', public_headers='session.h', header_path='samba', - deps='samdb auth_sam' + deps='samdb auth4_sam' ) bld.SAMBA_SUBSYSTEM('samba_server_gensec', source='samba_server_gensec.c', - public_deps='credentials gensec auth' + public_deps='credentials gensec auth4' ) @@ -30,7 +30,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session', ) -bld.SAMBA_SUBSYSTEM('auth_sam', +bld.SAMBA_SUBSYSTEM('auth4_sam', source='sam.c', autoproto='auth_sam.h', public_deps='samdb security ldb tevent', @@ -41,7 +41,7 @@ bld.SAMBA_SUBSYSTEM('auth_sam', bld.SAMBA_PYTHON('pyauth', source='pyauth.c', public_deps='auth_system_session', - deps='samdb pytalloc-util pyparam_util pyldb-util pycredentials auth', + deps='samdb pytalloc-util pyparam_util pyldb-util pycredentials auth4', realname='samba/auth.so' ) |