diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-30 11:46:20 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:49:01 +1100 |
| commit | 045e3445a0cea796c400eacbdb28611b664ef902 (patch) | |
| tree | 0cf028d2cf6a917e4f80c4dd1ebe6007ec4570a8 | |
| parent | 7a26bb9f7790cf9e0bf2e0e7b841fd5c4a64594c (diff) | |
| download | samba-045e3445a0cea796c400eacbdb28611b664ef902.tar.gz samba-045e3445a0cea796c400eacbdb28611b664ef902.tar.bz2 samba-045e3445a0cea796c400eacbdb28611b664ef902.zip | |
s4-auth: make KERBEROS subsystem into authkrb5 private library
this fixes some double linking. The name 'KERBEROS' was also a bit
confusing, as it sounded like a base kerberos library, when it is in
fact part of auth
| -rw-r--r-- | source4/auth/gensec/wscript_build | 4 | ||||
| -rw-r--r-- | source4/auth/kerberos/wscript_build | 15 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/wscript_build | 2 | ||||
| -rw-r--r-- | source4/torture/wscript_build | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index ddb601a94c..902de0b152 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -14,7 +14,7 @@ bld.SAMBA_MODULE('gensec_krb5', source='gensec_krb5.c', subsystem='gensec', init_function='gensec_krb5_init', - deps='CREDENTIALS KERBEROS auth_session com_err', + deps='CREDENTIALS authkrb5 auth_session com_err', internal_module=False, ) @@ -23,7 +23,7 @@ bld.SAMBA_MODULE('gensec_gssapi', source='gensec_gssapi.c', subsystem='gensec', init_function='gensec_gssapi_init', - deps='gssapi CREDENTIALS KERBEROS' + deps='gssapi CREDENTIALS authkrb5' ) diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index 4f0c8ccadd..c272d294b7 100644 --- a/source4/auth/kerberos/wscript_build +++ b/source4/auth/kerberos/wscript_build @@ -1,15 +1,16 @@ #!/usr/bin/env python -bld.SAMBA_SUBSYSTEM('KERBEROS', - source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c', - autoproto='proto.h', - public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err', - deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr' - ) +bld.SAMBA_LIBRARY('authkrb5', + source='kerberos.c clikrb5.c kerberos_heimdal.c kerberos_pac.c gssapi_parse.c krb5_init_context.c keytab_copy.c', + autoproto='proto.h', + public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err', + deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr', + private_library=True + ) bld.SAMBA_SUBSYSTEM('KERBEROS_UTIL', autoproto='kerberos_util.h', source='kerberos_util.c', - deps='KERBEROS com_err ldb CREDENTIALS_KRB5 SECRETS', + deps='authkrb5 com_err ldb CREDENTIALS_KRB5 SECRETS', ) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index a2ed6592f3..6650f0bc6b 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -156,7 +156,7 @@ bld.SAMBA_MODULE('ldb_password_hash', subsystem='ldb', init_function='LDB_MODULE(password_hash)', internal_module=False, - deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS hdb krb5 com_err' + deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS authkrb5 hdb krb5 com_err' ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index cb8338231a..d843fc129f 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -73,7 +73,7 @@ bld.SAMBA_MODULE('TORTURE_AUTH', source='auth/ntlmssp.c auth/pac.c', autoproto='auth/proto.h', subsystem='smbtorture', - deps='LIBCLI_SMB gensec auth KERBEROS POPT_CREDENTIALS smbpasswd torture com_err gensec_ntlmssp', + deps='LIBCLI_SMB gensec auth authkrb5 POPT_CREDENTIALS smbpasswd torture com_err gensec_ntlmssp', internal_module=True ) |