credentials: Split up into several subsystems.

5 files changed, 22 insertions, 10 deletions

diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_secrets.c
index 4a9ccf5358..4a9ccf5358 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_secrets.c
diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build
index a8ef95fc14..38e007aa31 100644
--- a/source4/auth/credentials/wscript_build
+++ b/source4/auth/credentials/wscript_build
@@ -1,17 +1,29 @@
 #!/usr/bin/env python
 
 bld.SAMBA_SUBSYSTEM('CREDENTIALS',
-	source='credentials.c credentials_files.c credentials_ntlm.c credentials_krb5.c',
-	autoproto='credentials_proto.h',
-	public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS KERBEROS_UTIL UTIL_LDB gssapi com_err',
+	source='credentials.c',
 	public_headers='credentials.h',
-	deps='SECRETS SAMDB'
+	deps='LIBCRYPTO LIBSAMBA-ERRORS LIBEVENTS LIBCLI_AUTH LIBSECURITY',
 	)
 
+bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5',
+	source='credentials_krb5.c',
+	deps='KERBEROS_UTIL gssapi CREDENTIALS',
+	public_deps='com_err KERBEROS',
+	)
+
+bld.SAMBA_SUBSYSTEM('CREDENTIALS_SECRETS',
+	source='credentials_secrets.c',
+	deps='SECRETS CREDENTIALS_KRB5 CREDENTIALS_NTLM ldb',
+	)
+
+bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
+	source='credentials_ntlm.c',
+	deps='CREDENTIALS')
 
 bld.SAMBA_PYTHON('pycredentials',
 	source='pycredentials.c',
-	public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util',
+	public_deps='CREDENTIALS LIBCMDLINE_CREDENTIALS PYTALLOC pyparam_util CREDENTIALS_KRB5 CREDENTIALS_SECRETS',
 	realname='samba/credentials.so'
 	)
 
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index cf3d783350..dff85d6b80 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -4,18 +4,18 @@ bld.SAMBA_LIBRARY('gensec',
 	source='gensec.c socket.c gensec_tstream.c',
 	pc_files='gensec.pc',
 	autoproto='gensec_proto.h',
-	public_deps='CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT',
+	public_deps='UTIL_TEVENT LIBSAMBA-UTIL LIBSAMBA-ERRORS LIBPACKET auth_system_session',
 	public_headers='gensec.h',
 	deps='com_err',
 	vnum='0.0.1'
 	)
 
-
 bld.SAMBA_MODULE('gensec_krb5',
 	source='gensec_krb5.c',
 	subsystem='gensec',
 	init_function='gensec_krb5_init',
-	deps='CREDENTIALS KERBEROS auth_session'
+	deps='CREDENTIALS KERBEROS auth_session',
+	internal_module=False,
 	)
 
 
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index f5f615c004..8736b24366 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -10,6 +10,6 @@ bld.SAMBA_SUBSYSTEM('KERBEROS',
 bld.SAMBA_SUBSYSTEM('KERBEROS_UTIL',
 	autoproto='kerberos_util.h',
 	source='kerberos_util.c',
-	deps='KERBEROS com_err ldb SECRETS',
+	deps='KERBEROS com_err ldb CREDENTIALS_KRB5 SECRETS',
 	)
 
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index c3ce364077..936e6f5d8a 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -19,7 +19,7 @@ bld.SAMBA_MODULE('auth_server',
 	source='auth_server.c',
 	subsystem='auth',
 	init_function='auth_server_init',
-	deps='LIBSAMBA-UTIL LIBCLI_SMB'
+	deps='LIBSAMBA-UTIL LIBCLI_SMB CREDENTIALS_NTLM'
 	)