diff options
| author | Günther Deschner <gd@samba.org> | 2011-11-02 13:06:45 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-11-02 16:59:32 +0100 |
| commit | 54f7667f49088c68a927674ff869f42d4ca949a2 (patch) | |
| tree | fec1ffe5b1a5a7e692dd2d6ee68e73c7497d0c74 | |
| parent | 16627ca3139463a2a3ecf02481e20776522393cb (diff) | |
| download | samba-54f7667f49088c68a927674ff869f42d4ca949a2.tar.gz samba-54f7667f49088c68a927674ff869f42d4ca949a2.tar.bz2 samba-54f7667f49088c68a927674ff869f42d4ca949a2.zip | |
s3-waf: move trusts_util.c code into a private library.
Guenther
| -rw-r--r-- | source3/auth/wscript_build | 4 | ||||
| -rwxr-xr-x | source3/wscript_build | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index 2c94242908..e0fdcc257e 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -34,7 +34,7 @@ bld.SAMBA3_SUBSYSTEM('AUTH_COMMON', bld.SAMBA3_LIBRARY('auth', source=AUTH_SRC, - deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON samba-hostconfig''', + deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL AUTH_COMMON LIBRPCCLI_NETLOGON samba-hostconfig''', private_library=True) bld.SAMBA3_MODULE('auth_sam', @@ -80,7 +80,7 @@ bld.SAMBA3_MODULE('auth_server', bld.SAMBA3_MODULE('auth_domain', subsystem='auth', source=AUTH_DOMAIN_SRC, - deps='RPC_CLIENT_SCHANNEL', + deps='RPC_CLIENT_SCHANNEL trusts_util', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain')) diff --git a/source3/wscript_build b/source3/wscript_build index c9e77fbd00..310be78eb7 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -244,7 +244,7 @@ PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c''' SLCACHE_SRC = '''libsmb/samlogon_cache.c''' -DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c''' +DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c''' WINBINDD_SRC1 = '''winbindd/winbindd.c winbindd/winbindd_group.c @@ -1005,9 +1005,15 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE', bld.SAMBA3_SUBSYSTEM('DCUTIL', source=DCUTIL_SRC, - deps='ads LIBRPCCLI_NETLOGON msrpc3 libcli_lsa3 INIT_NETLOGON', + deps='ads msrpc3 libcli_lsa3 INIT_NETLOGON', vars=locals()) +bld.SAMBA3_LIBRARY('trusts_util', + source='libsmb/trusts_util.c', + deps='ads LIBRPCCLI_NETLOGON msrpc3 INIT_NETLOGON', + vars=locals(), + private_library=True) + bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', deps='tdb-wrap', @@ -1153,7 +1159,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient', source=RPCCLIENT_SRC, deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 - ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO + ads SMBREADLINE trusts_util RPC_NDR_WINREG RPC_NDR_ECHO RPC_CLIENT_SCHANNEL LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS @@ -1181,7 +1187,7 @@ bld.SAMBA3_BINARY('net', LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR - printing_migrate + printing_migrate trusts_util ''', vars=locals()) |