aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-02-24 10:36:55 +1100
committerAndrew Tridgell <tridge@samba.org>2011-02-24 11:57:48 +1100
commit8dbe665a0c0870aeb298b8f0d5a8a1a05e21a719 (patch)
tree207a6d14f0e95a2279e24bd3de4131ee6f380ba7
parentd37a55548b67e4e5693d337faeca2ec2da5f273f (diff)
downloadsamba-8dbe665a0c0870aeb298b8f0d5a8a1a05e21a719.tar.gz
samba-8dbe665a0c0870aeb298b8f0d5a8a1a05e21a719.tar.xz
samba-8dbe665a0c0870aeb298b8f0d5a8a1a05e21a719.zip
build: moved schannel_sign.c into a shared COMMON_SCHANNEL subsystem
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--libcli/auth/wscript_build6
-rw-r--r--source3/wscript_build5
-rw-r--r--source4/auth/gensec/wscript_build4
-rw-r--r--source4/rpc_server/wscript_build2
-rw-r--r--source4/smbd/wscript_build2
5 files changed, 8 insertions, 11 deletions
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index b7b959c440d..3d9e8e6283c 100644
--- 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 311bf33eb05..7522884949b 100644
--- 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 e0a518e1ee5..01b3ce9ee27 100644
--- 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 815459baaf8..58b8686b9e9 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 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 0d91d4160b4..9d668898123 100644
--- 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}'
)