build: moved schannel_sign.c into a shared COMMON_SCHANNEL subsystem

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

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index b7b959c440de3060f1c023a9a242c6594a278d5e..3d9e8e6283cb33b3629ad32d075cde00c41c7cbd 100644 (file)
--- a/libcli/auth/wscript_build
+++ b/libcli/auth/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_LIBRARY('cliauth',
                   source='',
-                  deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNELDB PAM_ERRORS',
+                  deps='NTLMSSP_COMMON MSRPC_PARSE LIBCLI_AUTH COMMON_SCHANNEL PAM_ERRORS',
                   private_library=True,
                   grouping_library=True)
 
@@ -24,8 +24,8 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH',
        )
 
 
-bld.SAMBA_SUBSYSTEM('COMMON_SCHANNELDB',
-       source='schannel_state_tdb.c',
+bld.SAMBA_SUBSYSTEM('COMMON_SCHANNEL',
+       source='schannel_state_tdb.c schannel_sign.c',
        deps='tdb-wrap UTIL_TDB'
        )
 

diff --git a/source3/wscript_build b/source3/wscript_build
index 311bf33eb05f4eecef4df25e4ce05ea31b655986..7522884949b9fba73994c4b16a34a51f2c5dfac2 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -133,8 +133,6 @@ LIBNTLMSSP_SRC = '''
 
 TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
 
-SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
-
 LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clispnego.c
              libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
@@ -147,7 +145,6 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/smbsock_connect.c'''
 
 LIBMSRPC_SRC = '''
-               ${SCHANNEL_SRC}
                rpc_client/cli_pipe.c
                librpc/crypto/gse_krb5.c
                librpc/crypto/gse.c
@@ -687,7 +684,7 @@ bld.SAMBA3_LIBRARY('nss_wins',
 bld.SAMBA3_SUBSYSTEM('msrpc3',
                     source='${LIBMSRPC_SRC}',
                     deps='''ndr ndr-util NDR_SECURITY NDR_DCERPC NDR_SCHANNEL
-                    RPC_NDR_EPMAPPER COMMON_SCHANNELDB LIBCLI_AUTH
+                    RPC_NDR_EPMAPPER COMMON_SCHANNEL LIBCLI_AUTH
                     LIBTSOCKET krb5''',
                     vars=locals())
 

diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index e0a518e1ee55b5abee4f51a9d81b8c24a6da1ab2..01b3ce9ee27e78fe8fa1bcf76e962e479b6bfc4a 100644 (file)
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -46,9 +46,9 @@ bld.SAMBA_MODULE('gensec_spnego',
 
 
 bld.SAMBA_MODULE('gensec_schannel',
-       source='schannel.c ../../../libcli/auth/schannel_sign.c',
+       source='schannel.c',
        subsystem='gensec',
-       deps='COMMON_SCHANNELDB NDR_SCHANNEL credentials ndr auth_session',
+       deps='COMMON_SCHANNEL NDR_SCHANNEL credentials ndr auth_session',
        internal_module=True,
        autoproto='schannel_proto.h',
        init_function='gensec_schannel_init'

diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 815459baaf830678f30232941a05644774a71f3f..58b8686b9e90cb08aa0f9b2becb5911bcb29c1bf 100644 (file)
--- 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 auth4_sam samba-hostconfig CLDAPD'
+       deps='DCERPC_COMMON RPC_NDR_IRPC COMMON_SCHANNEL ndr-standard auth4_sam samba-hostconfig CLDAPD'
        )
 
 

diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 0d91d4160b44af657a92864c9c2da37da6d62bf7..9d6688981235c592a1fe69f40f93468aa05595d4 100644 (file)
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -20,7 +20,7 @@ bld.SAMBA_BINARY('samba',
        manpages='samba.8',
        subsystem_name='service',
        deps='''events process_model service samba-hostconfig samba-util POPT_SAMBA PIDFILE
-                popt gensec registry ntptr ntvfs share cluster COMMON_SCHANNELDB SECRETS''',
+                popt gensec registry ntptr ntvfs share cluster COMMON_SCHANNEL SECRETS''',
        pyembed=True,
        install_path='${SBINDIR}'
        )