diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/auth/kerberos/wscript_build | 2 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/wscript_build | 2 | ||||
| -rw-r--r-- | source4/dsdb/wscript_build | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_build | 20 |
4 files changed, 13 insertions, 13 deletions
diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index 4cb9d799b6..435601d5e5 100644 --- a/source4/auth/kerberos/wscript_build +++ b/source4/auth/kerberos/wscript_build @@ -3,7 +3,7 @@ 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='HEIMDAL_KRB5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE', + public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE', deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET LIBNDR' ) diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index e455ae9249..083ec6c84c 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -139,7 +139,7 @@ bld.SAMBA_MODULE('ldb_password_hash', subsystem='ldb', init_function='LDB_MODULE(password_hash)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS HEIMDAL_KRB5' + deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS krb5' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 3c2742d5d0..92a367db18 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -5,7 +5,7 @@ bld.RECURSE('samdb/ldb_modules') bld.SAMBA_SUBSYSTEM('SAMDB', source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c', autoproto='samdb/samdb_proto.h', - public_deps='HEIMDAL_KRB5', + public_deps='krb5', deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL' ) diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index c81a4d3990..c451f85f16 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -408,7 +408,7 @@ bld.HEIMDAL_LIBRARY('kdc', includes='../heimdal/kdc', heimdal_autoproto='../heimdal/kdc/kdc-protos.h', heimdal_autoproto_private='../heimdal/kdc/kdc-private.h', - deps='roken HEIMDAL_KRB5 hdb HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO', + deps='roken krb5 hdb HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO', ) @@ -416,14 +416,14 @@ bld.HEIMDAL_LIBRARY('heimntlm', source='../heimdal/lib/ntlm/ntlm.c', includes='../heimdal/lib/ntlm', heimdal_autoproto='../heimdal/lib/ntlm/heimntlm-protos.h', - deps='roken HEIMDAL_HCRYPTO HEIMDAL_KRB5', + deps='roken HEIMDAL_HCRYPTO krb5', ) bld.SAMBA_SUBSYSTEM('HEIMDAL_HDB_KEYS', '../heimdal/lib/hdb/keys.c', includes='../heimdal/lib/hdb', - deps='roken HEIMDAL_HCRYPTO HEIMDAL_KRB5 HEIMDAL_HDB_ASN1' + deps='roken HEIMDAL_HCRYPTO krb5 HEIMDAL_HDB_ASN1' ) @@ -435,7 +435,7 @@ bld.HEIMDAL_LIBRARY('hdb', includes='../heimdal/lib/hdb', heimdal_autoproto='../heimdal/lib/hdb/hdb-protos.h', heimdal_autoproto_private='../heimdal/lib/hdb/hdb-private.h', - deps='HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS roken HEIMDAL_HCRYPTO com_err HEIMDAL_HDB_ASN1', + deps='HDB_LDB krb5 HEIMDAL_HDB_KEYS roken HEIMDAL_HCRYPTO com_err HEIMDAL_HDB_ASN1', ) @@ -481,7 +481,7 @@ bld.HEIMDAL_LIBRARY('gssapi', ../heimdal/lib/gssapi/mech/gss_export_sec_context.c ../heimdal/lib/gssapi/mech/gss_inquire_context.c ../heimdal/lib/gssapi/mech/gss_release_name.c ../heimdal/lib/gssapi/mech/gss_set_cred_option.c ../heimdal/lib/gssapi/mech/gss_pseudo_random.c gssapi-glue.c''', includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech', - deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken HEIMDAL_KRB5', + deps='HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5', ) @@ -502,7 +502,7 @@ bld.SAMBA_GENERATOR( enabled = not bld.CONFIG_SET('HAVE_ERR_H') ) -bld.HEIMDAL_LIBRARY('HEIMDAL_KRB5', +bld.HEIMDAL_LIBRARY('krb5', bld.SUBDIR('../heimdal/lib/krb5/', '''acache.c add_et_list.c addr_families.c appdefault.c @@ -541,7 +541,7 @@ bld.HEIMDAL_LIBRARY('HEIMDAL_KRB5', heimdal_autoproto_options='-E KRB5_LIB -q -P comment -o', heimdal_autoproto_private='../heimdal/lib/krb5/krb5-private.h', cflags = bld.dynconfig_cflags(), - deps='roken HEIMDAL_PKINIT_ASN1 wind HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO LIBSAMBA-HOSTCONFIG intl', + deps='roken HEIMDAL_PKINIT_ASN1 wind HEIMDAL_KRB5_ASN1 hx509 HEIMDAL_HCRYPTO LIBSAMBA-HOSTCONFIG intl', ) @@ -569,7 +569,7 @@ bld.SAMBA_SUBSYSTEM('HEIMDAL_HCRYPTO', ) -bld.HEIMDAL_LIBRARY('HEIMDAL_HX509', +bld.HEIMDAL_LIBRARY('hx509', '../heimdal/lib/hx509/ca.c ../heimdal/lib/hx509/cert.c ../heimdal/lib/hx509/cms.c ../heimdal/lib/hx509/collector.c ../heimdal/lib/hx509/crypto.c ../heimdal/lib/hx509/error.c ../heimdal/lib/hx509/env.c ../heimdal/lib/hx509/file.c ../heimdal/lib/hx509/keyset.c ../heimdal/lib/hx509/ks_dir.c ../heimdal/lib/hx509/ks_file.c ../heimdal/lib/hx509/ks_keychain.c ../heimdal/lib/hx509/ks_mem.c ../heimdal/lib/hx509/ks_null.c ../heimdal/lib/hx509/ks_p11.c ../heimdal/lib/hx509/ks_p12.c ../heimdal/lib/hx509/lock.c ../heimdal/lib/hx509/name.c ../heimdal/lib/hx509/peer.c ../heimdal/lib/hx509/print.c ../heimdal/lib/hx509/req.c ../heimdal/lib/hx509/revoke.c ../heimdal/lib/hx509/sel.c ../heimdal/lib/hx509/hx509_err.c ../heimdal/lib/hx509/sel-lex.c ../heimdal/lib/hx509/sel-gram.c', includes='../heimdal/lib/hx509', deps='roken com_err HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 wind', @@ -628,7 +628,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'): bld.SAMBA_BINARY('samba4kinit', '../heimdal/kuser/kinit.c ../heimdal/lib/vers/print_version.c', includes='../heimdal/lib/roken', - deps='HEIMDAL_KRB5 heimntlm', + deps='krb5 heimntlm', install=False ) @@ -636,7 +636,7 @@ bld.SAMBA_BINARY('samba4kinit', bld.SAMBA_BINARY('samba4kpasswd', '../heimdal/kpasswd/kpasswd.c ../heimdal/lib/vers/print_version.c', includes='../heimdal/lib/roken', - deps='HEIMDAL_KRB5 heimntlm', + deps='krb5 heimntlm', install=False ) |