s4:librpc/rpc: force printing in dcerpc_bh_do_ndr_print() log level >= 11
[sfrench/samba-autobuild/.git] / source4 / heimdal_build / wscript_build
index c71e22494bbfc0a3d36c5d9de111de4e7d7f8359..c733b8f5583df1ca425d2e8306084ae2a573d883 100644 (file)
@@ -12,8 +12,11 @@ def to_list(str):
         return str
     return str.split(None)
 
-def heimdal_path(p):
-    return os.path.join("../heimdal", p)
+def heimdal_path(p, absolute=False):
+    hpath = os.path.join("../heimdal", p)
+    if not absolute:
+        return hpath
+    return os.path.normpath(os.path.join(bld.curdir, hpath))
 
 def heimdal_paths(ps):
     return [heimdal_path(p) for p in to_list(ps)]
@@ -66,8 +69,8 @@ def HEIMDAL_ASN1(name, source,
 
     t = bld(rule=asn1_rule,
             ext_out = '.x',
-            before = 'cc',
-            on_results = True,
+            before = 'c',
+            update_outputs = True,
             shell = True,
             source = source,
             target = out_files,
@@ -89,7 +92,7 @@ def HEIMDAL_ASN1(name, source,
             source = out_files[0],
             target = cfile,
             shell = True,
-            on_results=True,
+            update_outputs=True,
             ext_out = '.c',
             ext_in = '.x',
             depends_on = name + '_ASN1',
@@ -100,7 +103,7 @@ def HEIMDAL_ASN1(name, source,
             source = out_files[1],
             ext_out = '.c',
             ext_in = '.x',
-            on_results=True,
+            update_outputs=True,
             target = hfile,
             depends_on = name + '_ASN1',
             name = name + '_H')
@@ -110,7 +113,7 @@ def HEIMDAL_ASN1(name, source,
             source = out_files[2],
             ext_out = '.c',
             ext_in = '.x',
-            on_results=True,
+            update_outputs=True,
             target = hpriv,
             depends_on = name + '_ASN1',
             name = name + '_PRIV_H')
@@ -120,7 +123,7 @@ def HEIMDAL_ASN1(name, source,
     includes = to_list(includes)
     includes.append(os.path.dirname(out_files[0]))
 
-    t = bld(features       = 'cc',
+    t = bld(features       = 'c',
             source         = cfile,
             target         = name,
             samba_cflags   = CURRENT_CFLAGS(bld, name, ''),
@@ -155,7 +158,7 @@ def HEIMDAL_ERRTABLE(name, source):
     t = bld(rule='"${SRC[1].abspath(env)}" "${TGT[0].parent.abspath(env)}" "${COMPILE_ET}" "${SRC[0].abspath(env)}" ${TGT[0].bldpath(env)}',
             ext_out = '.c',
             before  = 'cc',
-            on_results = True,
+            update_outputs = True,
             shell   = True,
             source  = sources,
             target  = out_files,
@@ -173,7 +176,7 @@ def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'):
     t = bld(rule='${PERL} "${HEIMDAL}/cf/make-proto.pl" ${OPTIONS} "${TGT[0].abspath(env)}" ${SRC}',
             source=source,
             target=header,
-            on_results=True,
+            update_outputs=True,
             ext_out='.c',
             before='cc')
     t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal')
@@ -198,7 +201,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
         source=source,
         target=target,
         shell=isinstance(rule, str),
-        on_results=True,
+        update_outputs=True,
         before='cc',
         ext_out='.c',
         vars=[rule],
@@ -206,7 +209,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
         name=name)
 
 
-def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cflags=''):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''):
     '''define a Heimdal library'''
 
     obj_target = libname + '.objlist'
@@ -218,7 +221,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cf
                         source         = source,
                         deps           = deps,
                         includes       = includes,
-                        cflags         = cflags,
                         group          = 'main')
 
     if not SET_TARGET_TYPE(bld, libname, "LIBRARY"):
@@ -239,9 +241,9 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cf
         bundled_name = libname
     version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
 
-    features = 'cc cshlib symlink_lib install_lib'
+    features = 'c cshlib symlink_lib install_lib'
 
-    bld.set_group('libraries')
+    bld.set_group('main')
     t = bld(
         features        = features,
         source          = [],
@@ -254,7 +256,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cf
         ldflags         = ldflags,
         vars            = [version],
         private_library = bundled_build,
-        version_script  = heimdal_path(version_script),
+        version_script  = heimdal_path(version_script, absolute=True),
         )
 
 
@@ -275,10 +277,10 @@ def HEIMDAL_SUBSYSTEM(modname, source,
     bld.set_group(group)
 
     return bld(
-        features       = 'cc',
+        features       = 'c',
         source         = source,
         target         = modname,
-        samba_cflags   = CURRENT_CFLAGS(bld, modname, cflags),
+        samba_cflags   = CURRENT_CFLAGS(bld, modname, cflags, allow_warnings=True),
         depends_on     = '',
         samba_deps     = to_list(deps),
         samba_includes = includes,
@@ -296,7 +298,7 @@ def HEIMDAL_BINARY(binname, source,
                  use_hostcc=False,
                  use_global_deps=True,
                  compiler=None,
-                 group='binaries',
+                 group='main',
                  install=True,
                  install_path=None):
     '''define a Samba binary'''
@@ -304,7 +306,7 @@ def HEIMDAL_BINARY(binname, source,
     if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
         return
 
-    features = 'cc cprogram symlink_bin install_bin'
+    features = 'c cprogram symlink_bin install_bin'
 
     obj_target = binname + '.objlist'
 
@@ -344,52 +346,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'):
@@ -443,12 +399,6 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
         ../heimdal_build/replace.c
     '''
 
-    if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
-        ROKEN_HOSTCC_SOURCE += '''
-            lib/roken/getprogname.c
-            lib/roken/setprogname.c
-        '''
-
     if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
         ROKEN_HOSTCC_SOURCE += '''
             lib/roken/closefrom.c
@@ -458,6 +408,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
         lib/roken/resolve.c
         lib/roken/socket.c
         lib/roken/roken_gethostby.c
+        lib/roken/strerror_r.c
     '''
 
     HEIMDAL_LIBRARY('roken',
@@ -473,167 +424,255 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
         use_hostcc=True,
         use_global_deps=False,
         includes='../heimdal/lib/roken',
-        cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+        cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
         group='compiler_libraries',
         deps='LIBREPLACE_HOSTCC',
         )
 
-    HEIMDAL_BINARY('rkpty', 'lib/roken/rkpty.c',
-            deps='roken',
-            install=False
+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)
-
-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)
+    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',
+        options="--sequence=HDB-Ext-KeySet --sequence=Keys",
+        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_ERRTABLE('HEIMDAL_HDB_ERR_ET', 'lib/hdb/hdb_err.et')
 
-HEIMDAL_SUBSYSTEM('HEIMDAL_HDB_KEYS',
-    'lib/hdb/keys.c',
-    includes='../heimdal/lib/hdb',
-    deps='roken hcrypto krb5 HEIMDAL_HDB_ASN1'
-    )
+    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)
 
-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',
-    )
+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_GSSAPI_SPNEGO_SOURCE = '''
+        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
+    '''
+
+    HEIMDAL_AUTOPROTO_PRIVATE('lib/gssapi/spnego/spnego-private.h',
+                              HEIMDAL_GSSAPI_SPNEGO_SOURCE)
+
+    HEIMDAL_GSSAPI_KRB5_SOURCE = '''
+        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/krb5/pname_to_uid.c
+        lib/gssapi/krb5/authorize_localname.c
+    '''
 
-# 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')
+    HEIMDAL_AUTOPROTO_PRIVATE('lib/gssapi/krb5/gsskrb5-private.h',
+                              HEIMDAL_GSSAPI_KRB5_SOURCE)
+
+    HEIMDAL_LIBRARY('gssapi',
+                    HEIMDAL_GSSAPI_SPNEGO_SOURCE + HEIMDAL_GSSAPI_KRB5_SOURCE + '''
+    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
+                                   aname_to_localname.c kuserok.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 com_err HEIMDAL_CONFIG heimbase execinfo samba_intl',
+                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 = '''
@@ -657,6 +696,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',
@@ -848,7 +889,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COM_ERR'):
     HEIMDAL_LIBRARY('com_err',
         'lib/com_err/com_err.c lib/com_err/error.c',
         includes='../heimdal/lib/com_err',
-        deps='roken intl',
+        deps='roken samba_intl',
         vnum='0.25',
         version_script='lib/com_err/version-script.map',
         )
@@ -872,7 +913,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_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,
-        cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+        cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
         includes='../heimdal/lib/asn1',
         group='build_compilers',
         deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC',
@@ -888,7 +929,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
         use_global_deps=False,
         includes='../heimdal/lib/com_err',
         group='build_compilers',
-        cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+        cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
         deps='ROKEN_HOSTCC LIBREPLACE_HOSTCC HEIMDAL_VERS_HOSTCC',
         install=False
         )
@@ -896,84 +937,25 @@ 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('samba4kgetcred',
+    'kuser/kgetcred.c',
+    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto asn1',
+    install=False
+    )
 
 HEIMDAL_BINARY('samba4kpasswd',
     'kpasswd/kpasswd.c',
-    deps='krb5 heimntlm roken HEIMDAL_VERS',
+    deps='krb5 heimntlm roken HEIMDAL_VERS hcrypto',
     install=False
     )
 
-
-HEIMDAL_GSSAPI_SPNEGO_SOURCE = '''
-    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
-'''
-
-HEIMDAL_AUTOPROTO_PRIVATE('lib/gssapi/spnego/spnego-private.h',
-                              HEIMDAL_GSSAPI_SPNEGO_SOURCE)
-
-
-HEIMDAL_GSSAPI_KRB5_SOURCE = '''
-    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
-'''
-
-HEIMDAL_AUTOPROTO_PRIVATE('lib/gssapi/krb5/gsskrb5-private.h',
-                              HEIMDAL_GSSAPI_KRB5_SOURCE)
-
-
-
+# Alias subsystem to allow common kerberos code that will
+# otherwise link against MIT's gssapi_krb5 and k5crypto
+#
+# Note: that we also need this if we use system heimdal libraries
+HEIMDAL_SUBSYSTEM('gssapi_krb5', '', deps='gssapi')
+HEIMDAL_SUBSYSTEM('k5crypto', '', deps='krb5')