s4-auth: rename 'auth' subsystem to 'auth4'

this prevents conflicts with the s3 auth modules. The auth modules in
samba3 may appear in production smb.conf files, so it is preferable to
rename the s4 modules for minimal disruption.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

10 files changed, 34 insertions, 34 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'
 	)
 
diff --git a/source4/kdc/wscript_build b/source4/kdc/wscript_build
index 7ff2623d64..ac8f879ed4 100644
--- a/source4/kdc/wscript_build
+++ b/source4/kdc/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA_MODULE('service_kdc',
 
 bld.SAMBA_SUBSYSTEM('HDB_SAMBA4',
 	source='hdb-samba4.c',
-	deps='ldb auth_sam auth_sam_reply credentials hdb db-glue samba-hostconfig com_err',
+	deps='ldb auth4_sam auth_sam_reply credentials hdb db-glue samba-hostconfig com_err',
 	includes='../heimdal/kdc',
 	)
 
@@ -19,14 +19,14 @@ bld.SAMBA_SUBSYSTEM('HDB_SAMBA4',
 bld.SAMBA_SUBSYSTEM('WDC_SAMBA4',
 	source='wdc-samba4.c',
 	includes='../heimdal/kdc',
-	deps='ldb auth_sam auth_sam_reply credentials hdb PAC_GLUE samba-hostconfig com_err'
+	deps='ldb auth4_sam auth_sam_reply credentials hdb PAC_GLUE samba-hostconfig com_err'
 	)
 
 
 bld.SAMBA_SUBSYSTEM('PAC_GLUE',
 	source='pac-glue.c',
 	includes='../heimdal/kdc',
-	deps='ldb auth_sam auth_sam_reply credentials hdb samba-hostconfig com_err'
+	deps='ldb auth4_sam auth_sam_reply credentials hdb samba-hostconfig com_err'
 	)
 
 bld.SAMBA_LIBRARY('pac',
@@ -38,7 +38,7 @@ bld.SAMBA_LIBRARY('pac',
 
 bld.SAMBA_LIBRARY('db-glue',
 	source='db-glue.c',
-	deps='ldb auth_sam auth_sam_reply credentials hdb samba-hostconfig com_err kdc-policy',
+	deps='ldb auth4_sam auth_sam_reply credentials hdb samba-hostconfig com_err kdc-policy',
 	private_library=True
 	)
 
@@ -52,7 +52,7 @@ bld.SAMBA_LIBRARY('kdc-policy',
 
 bld.SAMBA_SUBSYSTEM('MIT_SAMBA',
 	source='mit_samba.c',
-	deps='ldb auth_sam auth_sam_reply credentials hdb db-glue PAC_GLUE samba-hostconfig com_err'
+	deps='ldb auth4_sam auth_sam_reply credentials hdb db-glue PAC_GLUE samba-hostconfig com_err'
 	)
 
 
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 3d1d36a3a3..b796728dad 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -86,7 +86,7 @@ bld.SAMBA_MODULE('dcerpc_netlogon',
 	source='netlogon/dcerpc_netlogon.c',
 	subsystem='dcerpc_server',
 	init_function='dcerpc_server_netlogon_init',
-	deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNELDB ndr-standard auth_sam samba-hostconfig CLDAPD'
+	deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNELDB ndr-standard auth4_sam samba-hostconfig CLDAPD'
 	)
 
 
diff --git a/source4/samba_tool/wscript_build b/source4/samba_tool/wscript_build
index 5b7dbc95ba..88b55eb996 100644
--- a/source4/samba_tool/wscript_build
+++ b/source4/samba_tool/wscript_build
@@ -3,6 +3,6 @@
 bld.SAMBA_BINARY('samba-tool',
 	source='samba_tool.c password.c vampire.c gpo.c',
 	autoproto='proto.h',
-	deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS policy auth',
+	deps='samba-hostconfig samba-util samba-net popt POPT_SAMBA POPT_CREDENTIALS policy auth4',
 	pyembed=True
 	)
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 0d26d16bbf..d6660bea63 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -73,7 +73,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH',
 	source='auth/ntlmssp.c auth/pac.c',
 	autoproto='auth/proto.h',
 	subsystem='smbtorture',
-	deps='LIBCLI_SMB gensec auth authkrb5 POPT_CREDENTIALS smbpasswd torture com_err gensec_ntlmssp',
+	deps='LIBCLI_SMB gensec auth4 authkrb5 POPT_CREDENTIALS smbpasswd torture com_err gensec_ntlmssp',
 	internal_module=True
 	)
 
diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index 7f377dd81e..2c4a16c5dd 100644
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_BINARY('ntlm_auth',
 	source='ntlm_auth.c',
 	manpages='man/ntlm_auth.1',
-	deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING events service',
+	deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth4 ntlm_check MESSAGING events service',
 	pyembed=True
 	)