build: moved libcli/auth/ntlmssp*.c into a common libcliauth.so library

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

6 files changed, 19 insertions, 20 deletions

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 15f8f643fa..b7b959c440 100644
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -1,9 +1,14 @@
 #!/usr/bin/env python
 
-bld.SAMBA_SUBSYSTEM('ntlm_check',
-	source='ntlm_check.c',
-	deps='samba-util'
-	)
+bld.SAMBA_LIBRARY('cliauth',
+                  source='',
+                  deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNELDB PAM_ERRORS',
+                  private_library=True,
+                  grouping_library=True)
+
+bld.SAMBA_SUBSYSTEM('NTLMSSP_COMMON',
+                    source='ntlmssp.c ntlmssp_ndr.c ntlmssp_server.c ntlmssp_sign.c ntlm_check.c',
+                    deps='samba-util NDR_NTLMSSP MSRPC_PARSE')
 
 
 bld.SAMBA_SUBSYSTEM('MSRPC_PARSE',
@@ -21,7 +26,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
 
 bld.SAMBA_SUBSYSTEM('COMMON_SCHANNELDB',
 	source='schannel_state_tdb.c',
-	deps='tdb-wrap'
+	deps='tdb-wrap UTIL_TDB'
 	)
 
 
diff --git a/source3/wscript_build b/source3/wscript_build
index 657a8668a3..311bf33eb0 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -129,11 +129,7 @@ LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
 
 LIBNTLMSSP_SRC = '''
                libsmb/ntlmssp.c
-               libsmb/ntlmssp_wrap.c
-               ../libcli/auth/ntlmssp.c
-               ../libcli/auth/ntlmssp_sign.c
-               ../libcli/auth/ntlmssp_ndr.c
-               ../libcli/auth/ntlmssp_server.c'''
+               libsmb/ntlmssp_wrap.c'''
 
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
@@ -719,7 +715,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
 
 bld.SAMBA3_LIBRARY('passdb',
                    source=PASSDB_SRC,
-                   deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient',
+                   deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient LIBCLI_AUTH',
                    private_library=True,
                    vars=locals())
 
@@ -787,7 +783,7 @@ bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
 
 bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
                     source=LIBNTLMSSP_SRC,
-                    deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
+                    deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIBSMB',
diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build
index 615419e5c0..2ac2773c85 100644
--- a/source4/auth/ntlm/wscript_build
+++ b/source4/auth/ntlm/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('auth4_sam_module',
 	source='auth_sam.c',
 	subsystem='auth4',
 	init_function='auth_sam_init',
-	deps='samdb auth4_sam ntlm_check samba-hostconfig'
+	deps='samdb auth4_sam NTLMSSP_COMMON samba-hostconfig'
 	)
 
 
diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index 1bbd4cc568..13827e9c96 100644
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -28,6 +28,7 @@
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "param/param.h"
+#include "libcli/auth/ntlmssp_private.h"
 
 /*********************************************************************
  Client side NTLMSSP
diff --git a/source4/auth/ntlmssp/wscript_build b/source4/auth/ntlmssp/wscript_build
index 0f18183e65..9c25aa10ed 100644
--- a/source4/auth/ntlmssp/wscript_build
+++ b/source4/auth/ntlmssp/wscript_build
@@ -2,15 +2,11 @@
 
 bld.SAMBA_MODULE('gensec_ntlmssp',
 	source='''ntlmssp.c ntlmssp_sign.c
-                  ntlmssp_client.c ntlmssp_server.c
-                  ../../../libcli/auth/ntlmssp_sign.c
-                  ../../../libcli/auth/ntlmssp_ndr.c
-                  ../../../libcli/auth/ntlmssp.c
-                  ../../../libcli/auth/ntlmssp_server.c''',
+                  ntlmssp_client.c ntlmssp_server.c''',
 	autoproto='proto.h',
 	subsystem='gensec',
 	init_function='gensec_ntlmssp_init',
-	deps='MSRPC_PARSE credentials NDR_NTLMSSP',
+	deps='credentials NTLMSSP_COMMON',
 	internal_module=True
 	)
 
diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index 2c4a16c5dd..da937dd357 100644
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -3,7 +3,8 @@
 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 auth4 ntlm_check MESSAGING events service',
+	deps='''samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE
+        auth4 NTLMSSP_COMMON MESSAGING events service''',
 	pyembed=True
 	)