diff options
| author | Simo Sorce <idra@samba.org> | 2012-01-26 15:27:54 -0500 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-01-27 18:11:10 +0100 |
| commit | e6c39a292c7aa17792f09222d17733ecc9207849 (patch) | |
| tree | 19eee80a64985d433ff5829fe1fa8e85e996cdcf /source3/wscript_build | |
| parent | c543ce102890532c45ec9b293b705336f0e2c5bf (diff) | |
| download | samba-e6c39a292c7aa17792f09222d17733ecc9207849.tar.gz samba-e6c39a292c7aa17792f09222d17733ecc9207849.tar.bz2 samba-e6c39a292c7aa17792f09222d17733ecc9207849.zip | |
s3-pdb: Break SECRETS3 dependency on PDB.
This is causing circular depdnendcies that bring libpdb in all code and this is
BAD.
This change 'protects' the sid and guid of the domain by adding a special key
that makes them effectively read only.
Limit this temporarily to the samba 4 build, once it gets some good testing the
samba4 ifdefs can be dropped.
fix pdb dependencies
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/wscript_build')
| -rwxr-xr-x | source3/wscript_build | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index 6d856a544f..60524709a7 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -692,7 +692,7 @@ bld.SAMBA3_LIBRARY('nss_wins', bld.SAMBA3_LIBRARY('gse', source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c', - deps='KRB5_WRAP gensec param KRBCLIENT SECRETS3', + deps='KRB5_WRAP gensec param KRBCLIENT secrets3', private_library=True) bld.SAMBA3_LIBRARY('msrpc3', @@ -725,7 +725,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP', bld.SAMBA3_LIBRARY('pdb', source=PASSDB_SRC, - deps='SECRETS3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping', + deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping', private_library=True, public_headers=''' include/passdb.h @@ -800,7 +800,7 @@ bld.SAMBA3_LIBRARY('popt_samba3', bld.SAMBA3_LIBRARY('util_cmdline', source='lib/util_cmdline.c', - deps='SECRETS3 popt', + deps='secrets3 popt', private_library=True) bld.SAMBA3_SUBSYSTEM('KRBCLIENT', @@ -871,9 +871,13 @@ bld.SAMBA3_SUBSYSTEM('CLDAP', deps='cli-ldap-common cli_cldap LIBTSOCKET', vars=locals()) -bld.SAMBA3_SUBSYSTEM('SECRETS3', +# NOTE: The secrets3 library is a low level library used by several subsystems. +# PLEASE DO NOT make it depend on high level libraries like PDB, if you are +# doing that your design is wrong and needs changing. -SSS +bld.SAMBA3_LIBRARY('secrets3', source=SECRETS_SRC, - deps='NDR_SECRETS param samba3util dbwrap pdb', + deps='NDR_SECRETS param samba3util dbwrap', + private_library=True, vars=locals()) bld.SAMBA3_LIBRARY('smbldap', @@ -1010,7 +1014,7 @@ bld.SAMBA3_SUBSYSTEM('FNAME_UTIL', bld.SAMBA3_SUBSYSTEM('LIBNET', source=LIBNET_SRC, - deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab', + deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb', vars=locals()) bld.SAMBA3_LIBRARY('net_keytab', @@ -1074,7 +1078,7 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL', bld.SAMBA3_LIBRARY('trusts_util', source='libsmb/trusts_util.c', - deps='libcli_netlogon3 msrpc3', + deps='libcli_netlogon3 msrpc3 pdb', vars=locals(), private_library=True) @@ -1148,7 +1152,7 @@ bld.SAMBA3_LIBRARY('libcli_netlogon3', bld.SAMBA3_LIBRARY('cli_spoolss', source=LIBCLI_SPOOLSS_SRC, - deps='RPC_NDR_SPOOLSS param SECRETS3', + deps='RPC_NDR_SPOOLSS param secrets3', private_library=True) bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG', @@ -1359,7 +1363,7 @@ bld.SAMBA3_BINARY('smbta-util', source=SMBTA_UTIL_SRC, deps=''' talloc - SECRETS3 + secrets3 param''', vars=locals()) |