[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Fri Dec 31 20:47:02 MST 2010


The branch, master has been updated
       via  3b4fd35 heimdal_build: Add missing dependencies when building with system heimdal.
       via  d93fd5f heimdal_build: Support using system gssapi library.
       via  6a669c7 heimdal_build: Support using system hdb and kdc libraries.
       via  0d6c739 heimdal_build: Add conditionals for all libraries.
       via  91fc7a2 heimdal_build: Allow using system krb5.
       via  4ea9924 heimdal_build: Allow using system heimntlm.
       via  3febaed heimdal_build: Look for asn1_compile (but by default, don't use it).
      from  5792fa9 s4-python: Only set BASETYPE flag if subclassing is supported.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3b4fd3573e581c610e38cc6a652d57da533062c4
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 1 03:56:27 2011 +0100

    heimdal_build: Add missing dependencies when building with system heimdal.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sat Jan  1 04:46:35 CET 2011 on sn-devel-104

commit d93fd5f06b5a9e6c58e4b4239d704b8c60f522ca
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 1 02:50:54 2011 +0100

    heimdal_build: Support using system gssapi library.

commit 6a669c7454c9ee824c75a72061a96527956933d6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 1 02:40:18 2011 +0100

    heimdal_build: Support using system hdb and kdc libraries.

commit 0d6c739260697d9894937374931421aa7db7dcba
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 1 02:10:05 2011 +0100

    heimdal_build: Add conditionals for all libraries.

commit 91fc7a2ddc228221a129e9f1a586f15e0ef2c994
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 1 02:05:23 2011 +0100

    heimdal_build: Allow using system krb5.

commit 4ea992428bbfea18b261ce28417228be730ffbc8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 1 01:54:35 2011 +0100

    heimdal_build: Allow using system heimntlm.

commit 3febaed9ba9e02ba43259023c4e8255e53c0ad85
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Jan 1 01:25:10 2011 +0100

    heimdal_build: Look for asn1_compile (but by default, don't use it).

-----------------------------------------------------------------------

Summary of changes:
 source4/auth/kerberos/wscript_build     |    2 +-
 source4/heimdal_build/wscript_build     |  398 ++++++++++++++++---------------
 source4/heimdal_build/wscript_configure |   37 +++-
 source4/libcli/wscript_build            |    1 +
 4 files changed, 234 insertions(+), 204 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build
index c272d29..1c3790c 100644
--- a/source4/auth/kerberos/wscript_build
+++ b/source4/auth/kerberos/wscript_build
@@ -3,7 +3,7 @@
 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',
+                  public_deps='krb5 NDR_KRB5PAC samba_socket LIBCLI_RESOLVE com_err asn1',
                   deps='ASN1_UTIL auth_sam_reply tevent LIBPACKET ndr',
                   private_library=True
                   )
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index dae6786..77f6a54 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -53,13 +53,17 @@ def HEIMDAL_ASN1(name, source,
     # source file. Note that in the case of a option_file, we have more than
     # one source file
     cd_rule = 'cd "${TGT[0].parent.abspath(env)}"'
-    asn1_rule = cd_rule + ' && "${BLDBIN}/asn1_compile" ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file "${SRC[0].abspath(env)}" ${ASN1NAME}'
+    asn1_rule = cd_rule + ' && "${ASN1_COMPILE}" ${OPTION_FILE} ${ASN1OPTIONS} --one-code-file "${SRC[0].abspath(env)}" ${ASN1NAME}'
 
     source = to_list(source)
 
     if option_file is not None:
         source.append(option_file)
 
+    deps = ''
+    if not bld.CONFIG_SET('USING_SYSTEM_ASN1_COMPILE'):
+        deps = 'asn1_compile'
+
     t = bld(rule=asn1_rule,
             ext_out = '.x',
             before = 'cc',
@@ -67,7 +71,7 @@ def HEIMDAL_ASN1(name, source,
             shell = True,
             source = source,
             target = out_files,
-            depends_on = 'asn1_compile',
+            depends_on = deps,
             name=name + '_ASN1')
 
     t.env.ASN1NAME     = asn1name
@@ -340,52 +344,6 @@ def HEIMDAL_BINARY(binname, source,
         )
 
 
-HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1',
-    source='lib/gssapi/spnego/spnego.asn1',
-    options='--sequence=MechTypeList',
-    includes='../heimdal/lib/asn1',
-    directory='lib/gssapi'
-    )
-
-
-HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1',
-    'lib/gssapi/mech/gssapi.asn1',
-    includes='../heimdal/lib/asn1',
-    directory='lib/gssapi'
-    )
-
-
-HEIMDAL_ASN1('HEIMDAL_DIGEST_ASN1',
-    'lib/asn1/digest.asn1',
-    directory='lib/asn1'
-    )
-
-
-HEIMDAL_ASN1('HEIMDAL_KX509_ASN1',
-    'lib/asn1/kx509.asn1',
-    directory='lib/asn1'
-    )
-
-
-HEIMDAL_ASN1('HEIMDAL_HDB_ASN1', 'lib/hdb/hdb.asn1',
-    directory='lib/asn1',
-    includes='../heimdal/lib/asn1')
-
-HEIMDAL_ERRTABLE('HEIMDAL_ASN1_ERR_ET', 'lib/asn1/asn1_err.et')
-
-HEIMDAL_ERRTABLE('HEIMDAL_HDB_ERR_ET', 'lib/hdb/hdb_err.et')
-
-HEIMDAL_ERRTABLE('HEIMDAL_HEIM_ERR_ET', 'lib/krb5/heim_err.et')
-
-HEIMDAL_ERRTABLE('HEIMDAL_K524_ERR_ET', 'lib/krb5/k524_err.et')
-
-HEIMDAL_ERRTABLE('HEIMDAL_KRB_ERR_ET', 'lib/krb5/krb_err.et')
-
-HEIMDAL_ERRTABLE('HEIMDAL_KRB5_ERR_ET', 'lib/krb5/krb5_err.et')
-
-HEIMDAL_ERRTABLE('HEIMDAL_GKRB5_ERR_ET', 'lib/gssapi/krb5/gkrb5_err.et')
-
-
 if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
 
     if not bld.CONFIG_SET('HAVE_IFADDRS_H'):
@@ -479,157 +437,198 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
             install=False
         )
 
-KDC_SOURCE='kdc/default_config.c kdc/kerberos5.c kdc/krb5tgs.c kdc/pkinit.c kdc/log.c kdc/misc.c kdc/digest.c kdc/process.c kdc/windc.c kdc/kx509.c'
-
-HEIMDAL_LIBRARY('kdc', source=KDC_SOURCE,
-                    includes='../heimdal/kdc',
-                    deps='roken krb5 hdb asn1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm hcrypto com_err wind heimbase',
-                    vnum='2.0.0',
-                    version_script='kdc/version-script.map')
-HEIMDAL_AUTOPROTO('kdc/kdc-protos.h', KDC_SOURCE)
-HEIMDAL_AUTOPROTO_PRIVATE('kdc/kdc-private.h', KDC_SOURCE)
-
-HEIMDAL_ERRTABLE('HEIMNTLM_ET',
-                 'lib/ntlm/ntlm_err.et')
-
-HEIMNTLM_SOURCE = 'lib/ntlm/ntlm.c'
-HEIMDAL_LIBRARY('heimntlm',
-                    source=HEIMNTLM_SOURCE,
-                    includes='../heimdal/lib/ntlm',
-                    deps='roken hcrypto krb5',
-                    vnum='1.0.1',
-                    version_script='lib/ntlm/version-script.map',
-    )
-HEIMDAL_AUTOPROTO('lib/ntlm/heimntlm-protos.h', HEIMNTLM_SOURCE)
+if not bld.CONFIG_SET("USING_SYSTEM_KDC"):
+    HEIMDAL_ASN1('HEIMDAL_KX509_ASN1',
+        'lib/asn1/kx509.asn1',
+        directory='lib/asn1'
+        )
+    HEIMDAL_ASN1('HEIMDAL_DIGEST_ASN1',
+        'lib/asn1/digest.asn1',
+        directory='lib/asn1'
+        )
+
+    KDC_SOURCE='kdc/default_config.c kdc/kerberos5.c kdc/krb5tgs.c kdc/pkinit.c kdc/log.c kdc/misc.c kdc/digest.c kdc/process.c kdc/windc.c kdc/kx509.c'
+
+    HEIMDAL_LIBRARY('kdc', source=KDC_SOURCE,
+                        includes='../heimdal/kdc',
+                        deps='roken krb5 hdb asn1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm hcrypto com_err wind heimbase',
+                        vnum='2.0.0',
+                        version_script='kdc/version-script.map')
+    HEIMDAL_AUTOPROTO('kdc/kdc-protos.h', KDC_SOURCE)
+    HEIMDAL_AUTOPROTO_PRIVATE('kdc/kdc-private.h', KDC_SOURCE)
+
+if not bld.CONFIG_SET("USING_SYSTEM_HEIMNTLM"):
+    HEIMDAL_ERRTABLE('HEIMNTLM_ET',
+                     'lib/ntlm/ntlm_err.et')
+
+    HEIMNTLM_SOURCE = 'lib/ntlm/ntlm.c'
+    HEIMDAL_LIBRARY('heimntlm',
+                        source=HEIMNTLM_SOURCE,
+                        includes='../heimdal/lib/ntlm',
+                        deps='roken hcrypto krb5',
+                        vnum='1.0.1',
+                        version_script='lib/ntlm/version-script.map',
+        )
+    HEIMDAL_AUTOPROTO('lib/ntlm/heimntlm-protos.h', HEIMNTLM_SOURCE)
 
+if not bld.CONFIG_SET("USING_SYSTEM_HDB"):
+    HEIMDAL_ASN1('HEIMDAL_HDB_ASN1', 'lib/hdb/hdb.asn1',
+        directory='lib/asn1',
+        includes='../heimdal/lib/asn1')
 
-HEIMDAL_SUBSYSTEM('HEIMDAL_HDB_KEYS',
-    'lib/hdb/keys.c',
-    includes='../heimdal/lib/hdb',
-    deps='roken hcrypto krb5 HEIMDAL_HDB_ASN1'
-    )
+    HEIMDAL_SUBSYSTEM('HEIMDAL_HDB_KEYS',
+        'lib/hdb/keys.c',
+        includes='../heimdal/lib/hdb',
+        deps='roken hcrypto krb5 HEIMDAL_HDB_ASN1'
+        )
 
+    HEIMDAL_ERRTABLE('HEIMDAL_HDB_ERR_ET', 'lib/hdb/hdb_err.et')
 
-HDB_SOURCE = '''lib/hdb/db.c lib/hdb/dbinfo.c lib/hdb/hdb.c
-                              lib/hdb/ext.c lib/hdb/keytab.c lib/hdb/hdb-keytab.c
-                              lib/hdb/mkey.c lib/hdb/ndbm.c lib/hdb/hdb_err.c
-                              ../heimdal_build/hdb-glue.c'''
+    HDB_SOURCE = '''lib/hdb/db.c lib/hdb/dbinfo.c lib/hdb/hdb.c
+                                  lib/hdb/ext.c lib/hdb/keytab.c lib/hdb/hdb-keytab.c
+                                  lib/hdb/mkey.c lib/hdb/ndbm.c lib/hdb/hdb_err.c
+                                  ../heimdal_build/hdb-glue.c'''
 
-HEIMDAL_LIBRARY('hdb',
-    version_script='lib/hdb/version-script.map',
-    source=HDB_SOURCE,
-    includes='../heimdal/lib/hdb',
-    deps='krb5 HEIMDAL_HDB_KEYS roken hcrypto com_err HEIMDAL_HDB_ASN1 wind',
-    vnum='11.0.2',
-    )
-HEIMDAL_AUTOPROTO('lib/hdb/hdb-protos.h', HDB_SOURCE)
-HEIMDAL_AUTOPROTO_PRIVATE('lib/hdb/hdb-private.h', HDB_SOURCE)
-
-
-HEIMDAL_LIBRARY('gssapi',
-                    '''
-lib/gssapi/spnego/init_sec_context.c lib/gssapi/spnego/external.c lib/gssapi/spnego/compat.c
-lib/gssapi/spnego/context_stubs.c lib/gssapi/spnego/cred_stubs.c lib/gssapi/spnego/accept_sec_context.c
-lib/gssapi/krb5/copy_ccache.c lib/gssapi/krb5/delete_sec_context.c lib/gssapi/krb5/init_sec_context.c
-lib/gssapi/krb5/context_time.c lib/gssapi/krb5/init.c lib/gssapi/krb5/address_to_krb5addr.c
-lib/gssapi/krb5/get_mic.c lib/gssapi/krb5/inquire_context.c lib/gssapi/krb5/add_cred.c
-lib/gssapi/krb5/inquire_cred.c lib/gssapi/krb5/inquire_cred_by_oid.c lib/gssapi/krb5/inquire_cred_by_mech.c
-lib/gssapi/krb5/inquire_mechs_for_name.c lib/gssapi/krb5/inquire_names_for_mech.c lib/gssapi/krb5/indicate_mechs.c
-lib/gssapi/krb5/inquire_sec_context_by_oid.c lib/gssapi/krb5/export_sec_context.c lib/gssapi/krb5/import_sec_context.c
-lib/gssapi/krb5/duplicate_name.c lib/gssapi/krb5/import_name.c lib/gssapi/krb5/compare_name.c
-lib/gssapi/krb5/export_name.c lib/gssapi/krb5/canonicalize_name.c lib/gssapi/krb5/unwrap.c
-lib/gssapi/krb5/wrap.c lib/gssapi/krb5/release_name.c lib/gssapi/krb5/cfx.c
-lib/gssapi/krb5/8003.c lib/gssapi/krb5/arcfour.c lib/gssapi/krb5/encapsulate.c
-lib/gssapi/krb5/display_name.c lib/gssapi/krb5/sequence.c lib/gssapi/krb5/display_status.c
-lib/gssapi/krb5/release_buffer.c lib/gssapi/krb5/external.c lib/gssapi/krb5/compat.c
-lib/gssapi/krb5/creds.c lib/gssapi/krb5/acquire_cred.c lib/gssapi/krb5/release_cred.c
-lib/gssapi/krb5/store_cred.c lib/gssapi/krb5/set_cred_option.c lib/gssapi/krb5/decapsulate.c
-lib/gssapi/krb5/verify_mic.c lib/gssapi/krb5/accept_sec_context.c lib/gssapi/krb5/set_sec_context_option.c
-lib/gssapi/krb5/process_context_token.c lib/gssapi/krb5/prf.c lib/gssapi/krb5/aeap.c
-lib/gssapi/mech/context.c lib/gssapi/mech/gss_krb5.c lib/gssapi/mech/gss_mech_switch.c
-lib/gssapi/mech/gss_process_context_token.c lib/gssapi/mech/gss_buffer_set.c
-lib/gssapi/mech/gss_aeap.c lib/gssapi/mech/gss_add_cred.c lib/gssapi/mech/gss_cred.c
-lib/gssapi/mech/gss_add_oid_set_member.c lib/gssapi/mech/gss_compare_name.c lib/gssapi/mech/gss_release_oid_set.c
-lib/gssapi/mech/gss_create_empty_oid_set.c lib/gssapi/mech/gss_decapsulate_token.c lib/gssapi/mech/gss_inquire_cred_by_oid.c
-lib/gssapi/mech/gss_canonicalize_name.c lib/gssapi/mech/gss_inquire_sec_context_by_oid.c lib/gssapi/mech/gss_inquire_names_for_mech.c
-lib/gssapi/mech/gss_inquire_mechs_for_name.c lib/gssapi/mech/gss_wrap_size_limit.c lib/gssapi/mech/gss_names.c
-lib/gssapi/mech/gss_verify.c lib/gssapi/mech/gss_display_name.c
-lib/gssapi/mech/gss_duplicate_oid.c lib/gssapi/mech/gss_display_status.c lib/gssapi/mech/gss_release_buffer.c
-lib/gssapi/mech/gss_release_oid.c lib/gssapi/mech/gss_test_oid_set_member.c
-lib/gssapi/mech/gss_release_cred.c
-lib/gssapi/mech/gss_set_sec_context_option.c lib/gssapi/mech/gss_export_name.c lib/gssapi/mech/gss_seal.c
-lib/gssapi/mech/gss_acquire_cred.c lib/gssapi/mech/gss_unseal.c lib/gssapi/mech/gss_verify_mic.c
-lib/gssapi/mech/gss_accept_sec_context.c lib/gssapi/mech/gss_inquire_cred_by_mech.c lib/gssapi/mech/gss_indicate_mechs.c
-lib/gssapi/mech/gss_delete_sec_context.c lib/gssapi/mech/gss_sign.c lib/gssapi/mech/gss_utils.c
-lib/gssapi/mech/gss_init_sec_context.c lib/gssapi/mech/gss_oid_equal.c lib/gssapi/mech/gss_oid.c
-lib/gssapi/mech/gss_oid_to_str.c lib/gssapi/mech/gss_mo.c
-lib/gssapi/mech/gss_context_time.c lib/gssapi/mech/gss_encapsulate_token.c lib/gssapi/mech/gss_get_mic.c
-lib/gssapi/mech/gss_import_sec_context.c lib/gssapi/mech/gss_inquire_cred.c lib/gssapi/mech/gss_wrap.c
-lib/gssapi/mech/gss_import_name.c lib/gssapi/mech/gss_duplicate_name.c lib/gssapi/mech/gss_unwrap.c
-lib/gssapi/mech/gss_export_sec_context.c lib/gssapi/mech/gss_inquire_context.c lib/gssapi/mech/gss_release_name.c
-lib/gssapi/mech/gss_set_cred_option.c  lib/gssapi/mech/gss_pseudo_random.c ../heimdal_build/gssapi-glue.c''',
-    includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech',
-    deps='hcrypto asn1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5 com_err wind',
-    vnum='2.0.0',
-    version_script='lib/gssapi/version-script.map',
-    )
+    HEIMDAL_LIBRARY('hdb',
+        version_script='lib/hdb/version-script.map',
+        source=HDB_SOURCE,
+        includes='../heimdal/lib/hdb',
+        deps='krb5 HEIMDAL_HDB_KEYS roken hcrypto com_err HEIMDAL_HDB_ASN1 wind',
+        vnum='11.0.2',
+        )
+    HEIMDAL_AUTOPROTO('lib/hdb/hdb-protos.h', HDB_SOURCE)
+    HEIMDAL_AUTOPROTO_PRIVATE('lib/hdb/hdb-private.h', HDB_SOURCE)
 
-# expand_path.c needs some of the install paths
-HEIMDAL_SUBSYSTEM('HEIMDAL_CONFIG',
-                  'lib/krb5/expand_path.c lib/krb5/plugin.c lib/krb5/context.c',
-                  includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include',
-                  cflags=bld.dynconfig_cflags('LIBDIR BINDIR LIBEXECDIR SBINDIR'),
-                  deps='hcrypto heimbase wind hx509 com_err'
-                  )
-
-KRB5_SOURCE = [os.path.join('lib/krb5/', x) for x in to_list(
-                               '''acache.c add_et_list.c
-                               addr_families.c appdefault.c
-                               asn1_glue.c auth_context.c
-                               build_ap_req.c build_auth.c cache.c
-                               changepw.c codec.c config_file.c
-                               constants.c convert_creds.c
-                               copy_host_realm.c crc.c creds.c
-                               crypto.c crypto-aes.c crypto-algs.c
-                               crypto-arcfour.c crypto-des3.c crypto-des.c
-                               crypto-des-common.c crypto-evp.c
-                               crypto-null.c crypto-pk.c crypto-rand.c
-                               data.c eai_to_heim_errno.c
-                               error_string.c expand_hostname.c
-                               fcache.c free.c free_host_realm.c
-                               generate_seq_number.c generate_subkey.c
-                               get_addrs.c get_cred.c
-                               get_default_principal.c
-                               get_default_realm.c get_for_creds.c
-                               get_host_realm.c get_in_tkt.c
-                               get_port.c init_creds.c init_creds_pw.c
-                               kcm.c keyblock.c keytab.c keytab_any.c
-                               keytab_file.c keytab_memory.c
-                               keytab_keyfile.c krbhst.c log.c
-                               mcache.c misc.c mk_error.c mk_priv.c
-                               mk_rep.c mk_req.c mk_req_ext.c
-                               mit_glue.c n-fold.c padata.c pkinit.c
-                               principal.c prog_setup.c pac.c
-                               pcache.c prompter_posix.c rd_cred.c rd_error.c
-                               rd_priv.c rd_rep.c rd_req.c replay.c
-                               salt.c salt-aes.c salt-arcfour.c salt-des3.c salt-des.c
-                               send_to_kdc.c set_default_realm.c
-                               store.c store-int.c store_emem.c store_fd.c
-                               store_mem.c ticket.c time.c transited.c
-                               version.c warn.c krb5_err.c
-                               heim_err.c k524_err.c krb_err.c''')]  + ["../heimdal_build/krb5-glue.c"]
-
-HEIMDAL_LIBRARY('krb5', KRB5_SOURCE,
-    version_script='lib/krb5/version-script.map',
-                    includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include',
-            deps='roken wind asn1 hx509 hcrypto samba-hostconfig intl com_err HEIMDAL_CONFIG heimbase',
-            vnum='26.0.0',
-                    )
-KRB5_PROTO_SOURCE = KRB5_SOURCE + ['lib/krb5/expand_path.c', 'lib/krb5/plugin.c', 'lib/krb5/context.c']
-
-HEIMDAL_AUTOPROTO_PRIVATE('lib/krb5/krb5-private.h', KRB5_PROTO_SOURCE)
-HEIMDAL_AUTOPROTO('lib/krb5/krb5-protos.h', KRB5_PROTO_SOURCE,
-    options='-E KRB5_LIB -q -P comment -o')
+
+if not bld.CONFIG_SET("USING_SYSTEM_GSSAPI"):
+    HEIMDAL_ERRTABLE('HEIMDAL_GKRB5_ERR_ET', 'lib/gssapi/krb5/gkrb5_err.et')
+
+    HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1',
+        'lib/gssapi/mech/gssapi.asn1',
+        includes='../heimdal/lib/asn1',
+        directory='lib/gssapi'
+        )
+
+    HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1',
+        source='lib/gssapi/spnego/spnego.asn1',
+        options='--sequence=MechTypeList',
+        includes='../heimdal/lib/asn1',
+        directory='lib/gssapi'
+        )
+
+    HEIMDAL_LIBRARY('gssapi',
+                        '''
+    lib/gssapi/spnego/init_sec_context.c lib/gssapi/spnego/external.c lib/gssapi/spnego/compat.c
+    lib/gssapi/spnego/context_stubs.c lib/gssapi/spnego/cred_stubs.c lib/gssapi/spnego/accept_sec_context.c
+    lib/gssapi/krb5/copy_ccache.c lib/gssapi/krb5/delete_sec_context.c lib/gssapi/krb5/init_sec_context.c
+    lib/gssapi/krb5/context_time.c lib/gssapi/krb5/init.c lib/gssapi/krb5/address_to_krb5addr.c
+    lib/gssapi/krb5/get_mic.c lib/gssapi/krb5/inquire_context.c lib/gssapi/krb5/add_cred.c
+    lib/gssapi/krb5/inquire_cred.c lib/gssapi/krb5/inquire_cred_by_oid.c lib/gssapi/krb5/inquire_cred_by_mech.c
+    lib/gssapi/krb5/inquire_mechs_for_name.c lib/gssapi/krb5/inquire_names_for_mech.c lib/gssapi/krb5/indicate_mechs.c
+    lib/gssapi/krb5/inquire_sec_context_by_oid.c lib/gssapi/krb5/export_sec_context.c lib/gssapi/krb5/import_sec_context.c
+    lib/gssapi/krb5/duplicate_name.c lib/gssapi/krb5/import_name.c lib/gssapi/krb5/compare_name.c
+    lib/gssapi/krb5/export_name.c lib/gssapi/krb5/canonicalize_name.c lib/gssapi/krb5/unwrap.c
+    lib/gssapi/krb5/wrap.c lib/gssapi/krb5/release_name.c lib/gssapi/krb5/cfx.c
+    lib/gssapi/krb5/8003.c lib/gssapi/krb5/arcfour.c lib/gssapi/krb5/encapsulate.c
+    lib/gssapi/krb5/display_name.c lib/gssapi/krb5/sequence.c lib/gssapi/krb5/display_status.c
+    lib/gssapi/krb5/release_buffer.c lib/gssapi/krb5/external.c lib/gssapi/krb5/compat.c
+    lib/gssapi/krb5/creds.c lib/gssapi/krb5/acquire_cred.c lib/gssapi/krb5/release_cred.c
+    lib/gssapi/krb5/store_cred.c lib/gssapi/krb5/set_cred_option.c lib/gssapi/krb5/decapsulate.c
+    lib/gssapi/krb5/verify_mic.c lib/gssapi/krb5/accept_sec_context.c lib/gssapi/krb5/set_sec_context_option.c
+    lib/gssapi/krb5/process_context_token.c lib/gssapi/krb5/prf.c lib/gssapi/krb5/aeap.c
+    lib/gssapi/mech/context.c lib/gssapi/mech/gss_krb5.c lib/gssapi/mech/gss_mech_switch.c
+    lib/gssapi/mech/gss_process_context_token.c lib/gssapi/mech/gss_buffer_set.c
+    lib/gssapi/mech/gss_aeap.c lib/gssapi/mech/gss_add_cred.c lib/gssapi/mech/gss_cred.c
+    lib/gssapi/mech/gss_add_oid_set_member.c lib/gssapi/mech/gss_compare_name.c lib/gssapi/mech/gss_release_oid_set.c
+    lib/gssapi/mech/gss_create_empty_oid_set.c lib/gssapi/mech/gss_decapsulate_token.c lib/gssapi/mech/gss_inquire_cred_by_oid.c
+    lib/gssapi/mech/gss_canonicalize_name.c lib/gssapi/mech/gss_inquire_sec_context_by_oid.c lib/gssapi/mech/gss_inquire_names_for_mech.c
+    lib/gssapi/mech/gss_inquire_mechs_for_name.c lib/gssapi/mech/gss_wrap_size_limit.c lib/gssapi/mech/gss_names.c
+    lib/gssapi/mech/gss_verify.c lib/gssapi/mech/gss_display_name.c
+    lib/gssapi/mech/gss_duplicate_oid.c lib/gssapi/mech/gss_display_status.c lib/gssapi/mech/gss_release_buffer.c
+    lib/gssapi/mech/gss_release_oid.c lib/gssapi/mech/gss_test_oid_set_member.c
+    lib/gssapi/mech/gss_release_cred.c
+    lib/gssapi/mech/gss_set_sec_context_option.c lib/gssapi/mech/gss_export_name.c lib/gssapi/mech/gss_seal.c
+    lib/gssapi/mech/gss_acquire_cred.c lib/gssapi/mech/gss_unseal.c lib/gssapi/mech/gss_verify_mic.c
+    lib/gssapi/mech/gss_accept_sec_context.c lib/gssapi/mech/gss_inquire_cred_by_mech.c lib/gssapi/mech/gss_indicate_mechs.c
+    lib/gssapi/mech/gss_delete_sec_context.c lib/gssapi/mech/gss_sign.c lib/gssapi/mech/gss_utils.c
+    lib/gssapi/mech/gss_init_sec_context.c lib/gssapi/mech/gss_oid_equal.c lib/gssapi/mech/gss_oid.c
+    lib/gssapi/mech/gss_oid_to_str.c lib/gssapi/mech/gss_mo.c
+    lib/gssapi/mech/gss_context_time.c lib/gssapi/mech/gss_encapsulate_token.c lib/gssapi/mech/gss_get_mic.c
+    lib/gssapi/mech/gss_import_sec_context.c lib/gssapi/mech/gss_inquire_cred.c lib/gssapi/mech/gss_wrap.c
+    lib/gssapi/mech/gss_import_name.c lib/gssapi/mech/gss_duplicate_name.c lib/gssapi/mech/gss_unwrap.c
+    lib/gssapi/mech/gss_export_sec_context.c lib/gssapi/mech/gss_inquire_context.c lib/gssapi/mech/gss_release_name.c
+    lib/gssapi/mech/gss_set_cred_option.c  lib/gssapi/mech/gss_pseudo_random.c ../heimdal_build/gssapi-glue.c''',
+        includes='../heimdal/lib/gssapi ../heimdal/lib/gssapi/gssapi ../heimdal/lib/gssapi/spnego ../heimdal/lib/gssapi/krb5 ../heimdal/lib/gssapi/mech',
+        deps='hcrypto asn1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5 com_err wind',
+        vnum='2.0.0',
+        version_script='lib/gssapi/version-script.map',
+        )
+
+if not bld.CONFIG_SET("USING_SYSTEM_KRB5"):
+    # expand_path.c needs some of the install paths
+    HEIMDAL_SUBSYSTEM('HEIMDAL_CONFIG',
+                      'lib/krb5/expand_path.c lib/krb5/plugin.c lib/krb5/context.c',
+                      includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include',
+                      cflags=bld.dynconfig_cflags('LIBDIR BINDIR LIBEXECDIR SBINDIR'),
+                      deps='hcrypto heimbase wind hx509 com_err'
+                      )
+
+    HEIMDAL_ERRTABLE('HEIMDAL_KRB5_ERR_ET', 'lib/krb5/krb5_err.et')
+
+    HEIMDAL_ERRTABLE('HEIMDAL_KRB_ERR_ET', 'lib/krb5/krb_err.et')
+
+    HEIMDAL_ERRTABLE('HEIMDAL_K524_ERR_ET', 'lib/krb5/k524_err.et')
+
+    HEIMDAL_ERRTABLE('HEIMDAL_HEIM_ERR_ET', 'lib/krb5/heim_err.et')
+
+    KRB5_SOURCE = [os.path.join('lib/krb5/', x) for x in to_list(
+                                   '''acache.c add_et_list.c
+                                   addr_families.c appdefault.c
+                                   asn1_glue.c auth_context.c
+                                   build_ap_req.c build_auth.c cache.c
+                                   changepw.c codec.c config_file.c
+                                   constants.c convert_creds.c
+                                   copy_host_realm.c crc.c creds.c
+                                   crypto.c crypto-aes.c crypto-algs.c
+                                   crypto-arcfour.c crypto-des3.c crypto-des.c
+                                   crypto-des-common.c crypto-evp.c
+                                   crypto-null.c crypto-pk.c crypto-rand.c
+                                   data.c eai_to_heim_errno.c
+                                   error_string.c expand_hostname.c
+                                   fcache.c free.c free_host_realm.c
+                                   generate_seq_number.c generate_subkey.c
+                                   get_addrs.c get_cred.c
+                                   get_default_principal.c
+                                   get_default_realm.c get_for_creds.c
+                                   get_host_realm.c get_in_tkt.c
+                                   get_port.c init_creds.c init_creds_pw.c
+                                   kcm.c keyblock.c keytab.c keytab_any.c
+                                   keytab_file.c keytab_memory.c
+                                   keytab_keyfile.c krbhst.c log.c
+                                   mcache.c misc.c mk_error.c mk_priv.c
+                                   mk_rep.c mk_req.c mk_req_ext.c
+                                   mit_glue.c n-fold.c padata.c pkinit.c
+                                   principal.c prog_setup.c pac.c
+                                   pcache.c prompter_posix.c rd_cred.c rd_error.c
+                                   rd_priv.c rd_rep.c rd_req.c replay.c
+                                   salt.c salt-aes.c salt-arcfour.c salt-des3.c salt-des.c
+                                   send_to_kdc.c set_default_realm.c
+                                   store.c store-int.c store_emem.c store_fd.c
+                                   store_mem.c ticket.c time.c transited.c
+                                   version.c warn.c krb5_err.c
+                                   heim_err.c k524_err.c krb_err.c''')]  + ["../heimdal_build/krb5-glue.c"]
+
+    HEIMDAL_LIBRARY('krb5', KRB5_SOURCE,
+        version_script='lib/krb5/version-script.map',
+                        includes='../heimdal/lib/krb5 ../heimdal/lib/asn1 ../heimdal/include',
+                deps='roken wind asn1 hx509 hcrypto intl com_err HEIMDAL_CONFIG heimbase',
+                vnum='26.0.0',
+                        )
+    KRB5_PROTO_SOURCE = KRB5_SOURCE + ['lib/krb5/expand_path.c', 'lib/krb5/plugin.c', 'lib/krb5/context.c']
+
+    HEIMDAL_AUTOPROTO_PRIVATE('lib/krb5/krb5-private.h', KRB5_PROTO_SOURCE)
+    HEIMDAL_AUTOPROTO('lib/krb5/krb5-protos.h', KRB5_PROTO_SOURCE,
+        options='-E KRB5_LIB -q -P comment -o')
 
 if not bld.CONFIG_SET("USING_SYSTEM_ASN1"):
     HEIMDAL_HEIM_ASN1_DER_SOURCE = '''
@@ -653,6 +652,8 @@ if not bld.CONFIG_SET("USING_SYSTEM_ASN1"):
                           group = 'compiler_prototypes',
                           options="-q -P comment -p")
 
+    HEIMDAL_ERRTABLE('HEIMDAL_ASN1_ERR_ET', 'lib/asn1/asn1_err.et')
+
     HEIMDAL_SUBSYSTEM('HEIMDAL_HEIM_ASN1',
         HEIMDAL_HEIM_ASN1_DER_SOURCE + 'lib/asn1/extra.c lib/asn1/timegm.c lib/asn1/asn1_err.c',
         includes='../heimdal/lib/asn1',
@@ -861,8 +862,10 @@ HEIMDAL_SUBSYSTEM('HEIMDAL_VERS',
         group='build_compilers',
         deps='roken replace')
 
-# here is the asn1 compiler build rule
-HEIMDAL_BINARY('asn1_compile',
+
+if not bld.CONFIG_SET('USING_SYSTEM_ASN1_COMPILE'):
+    # here is the asn1 compiler build rule
+    HEIMDAL_BINARY('asn1_compile',
     'lib/asn1/main.c lib/asn1/gen.c lib/asn1/gen_copy.c lib/asn1/gen_decode.c lib/asn1/gen_encode.c lib/asn1/gen_free.c lib/asn1/gen_glue.c lib/asn1/gen_length.c lib/asn1/gen_seq.c lib/asn1/gen_template.c lib/asn1/hash.c lib/asn1/symbol.c lib/asn1/asn1parse.c lib/asn1/lex.c',
     use_hostcc=True,
         use_global_deps=False,
@@ -872,6 +875,7 @@ HEIMDAL_BINARY('asn1_compile',
         deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC',
         install=False
     )
+    bld.env['ASN1_COMPILE'] = os.path.join(bld.env['BUILD_DIRECTORY'], 'asn1_compile')
 
 
 if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
@@ -889,14 +893,14 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
 
 HEIMDAL_BINARY('samba4kinit',
     'kuser/kinit.c',
-    deps='krb5 heimntlm roken HEIMDAL_VERS',
+    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
     install=False
     )
 
 
 HEIMDAL_BINARY('samba4kpasswd',
     'kpasswd/kpasswd.c',
-    deps='krb5 heimntlm roken HEIMDAL_VERS',
+    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
     install=False
     )
 
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 5936b04..29def8b 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -1,4 +1,12 @@
 #!/usr/bin/env python
+# Waf build script for Samba 4's bundled Heimdal.
+
+# Unless explicitly requested by the user (e.g.
+# "./configure --bundled-libraries=!asn1_compile") this will always use the
+# bundled Heimdal, even if a system heimdal was found. The reason


-- 
Samba Shared Repository


More information about the samba-cvs mailing list