[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Sat Oct 16 10:15:01 MDT 2010
The branch, master has been updated
via c161ad8 heimdal: Remove some unused arguments from HEIMDAL_SUBSYSTEM().
via 9147e19 heimdal: Allow leaving off prefix from asn1 option_file.
via eab84a6 heimdal: Leave off ../heimdal prefix to HEIMDAL_BINARY().
via d3ea644 heimdal: Allow leaving off prefix to HEIMDAL_ERRTABLE().
via 2aba5aa heimdal: Allow leaving off prefix for HEIMDAL_ASN1().
via c5d4d94 heimdal: Allow leaving off ../heimdal prefix for proto headers.
via 49d20a5 heimdal: Allow leaving off ../heimdal prefix for source files.
via c3009ac heimdal: Add convenience functions for finding heimdal paths.
via 953d253 heimdal: Call HEIMDAL_AUTOPROTO() manually.
via 32fce1f heimdal: Call HEIMDAL_AUTOPROTO_PRIVATE() manually.
via 1c4c96d heimdal: Add variables for source files.
via 196e8d1 heimdal: Simplify handling of ../heimdal prefixes in HEIMDAL_SUBSYSTEM.
via b2af44e heimdal_build: Fix detection of system roken library.
via c3366c1 heimdal_build: Remove ignored argument ldflags from HEIMDAL_BINARY().
from dd0f22d ldb:pyldb.c - remove pointless comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c161ad86d62112afc3fa571c71459540bb90925a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:30:51 2010 +0200
heimdal: Remove some unused arguments from HEIMDAL_SUBSYSTEM().
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sat Oct 16 16:14:24 UTC 2010 on sn-devel-104
commit 9147e196111b28bddf8994df199a9992a24aa5f2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:26:24 2010 +0200
heimdal: Allow leaving off prefix from asn1 option_file.
commit eab84a6ed0b90facd43ff7075c51f5e3e1b4739d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:25:19 2010 +0200
heimdal: Leave off ../heimdal prefix to HEIMDAL_BINARY().
commit d3ea64451ca3534c29ed66fb79bb9acec7683271
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:23:06 2010 +0200
heimdal: Allow leaving off prefix to HEIMDAL_ERRTABLE().
commit 2aba5aa4b61df0b7851a77eff3273766fb434819
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:21:05 2010 +0200
heimdal: Allow leaving off prefix for HEIMDAL_ASN1().
commit c5d4d94104715c59522114ed0a24cf202c5348a6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:16:44 2010 +0200
heimdal: Allow leaving off ../heimdal prefix for proto headers.
commit 49d20a5d5f7c24998dd849d91b6622f5332625d1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:13:10 2010 +0200
heimdal: Allow leaving off ../heimdal prefix for source files.
commit c3009ac689bf91e7a9cb1cc9c34e2b0e8ae246e2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:08:27 2010 +0200
heimdal: Add convenience functions for finding heimdal paths.
commit 953d25374869f177dab72807fef83651ef7e811a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:06:41 2010 +0200
heimdal: Call HEIMDAL_AUTOPROTO() manually.
commit 32fce1f0753489e340585ce6123024bc2b2042f7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 17:03:06 2010 +0200
heimdal: Call HEIMDAL_AUTOPROTO_PRIVATE() manually.
commit 1c4c96d3feea91945300b3796ce242d305d91b04
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 16:46:22 2010 +0200
heimdal: Add variables for source files.
commit 196e8d16558fbc97db687f61ec644a1669e94c3e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 16:37:11 2010 +0200
heimdal: Simplify handling of ../heimdal prefixes in HEIMDAL_SUBSYSTEM.
commit b2af44e92be1cdca2020efe92d845cf050fd44d6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 04:31:54 2010 +0200
heimdal_build: Fix detection of system roken library.
commit c3366c19a72f1a35e540fdaf89a6351cc6451ce6
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Oct 16 04:30:49 2010 +0200
heimdal_build: Remove ignored argument ldflags from HEIMDAL_BINARY().
-----------------------------------------------------------------------
Summary of changes:
source4/heimdal_build/wscript_build | 534 +++++++++++++++----------------
source4/heimdal_build/wscript_configure | 2 +-
2 files changed, 262 insertions(+), 274 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 0e08446..448dec2 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -4,8 +4,13 @@ import os
from samba_utils import SET_TARGET_TYPE, TO_LIST
from samba_autoconf import CURRENT_CFLAGS
-# waf build tool for building .et files with compile_et
+def heimdal_path(p):
+ return os.path.join("../heimdal", p)
+
+def heimdal_paths(ps):
+ return [heimdal_path(p) for p in TO_LIST(ps)]
+# waf build tool for building .et files with compile_et
def HEIMDAL_ASN1(name, source,
options='',
directory='',
@@ -13,10 +18,14 @@ def HEIMDAL_ASN1(name, source,
includes=''):
'''Build a ASN1 file using the asn1 compiler.
This will produce 2 output files'''
+ source = heimdal_path(source)
bname = os.path.basename(source)[0:-5];
dname = os.path.dirname(source)
asn1name = "%s_asn1" % bname
+ if option_file:
+ option_file = heimdal_path(option_file)
+
if not SET_TARGET_TYPE(bld, name, 'ASN1'):
return
@@ -24,10 +33,11 @@ def HEIMDAL_ASN1(name, source,
# sense elsewhere
bld.set_group('build_source')
- out_files = []
- out_files.append("../heimdal/%s/asn1_%s_asn1.x" % (directory, bname))
- out_files.append("../heimdal/%s/%s_asn1.hx" % (directory, bname))
- out_files.append("../heimdal/%s/%s_asn1-priv.hx" % (directory, bname))
+ out_files = heimdal_paths([
+ "%s/asn1_%s_asn1.x" % (directory, bname),
+ "%s/%s_asn1.hx" % (directory, bname),
+ "%s/%s_asn1-priv.hx" % (directory, bname),
+ ])
# the ${TGT[0].parent.abspath(env)} expression gives us the parent directory of
# the first target in the build directory
@@ -111,6 +121,8 @@ def HEIMDAL_ASN1(name, source,
def HEIMDAL_ERRTABLE(name, source):
'''Build a heimdal errtable from a .et file'''
+ source = heimdal_path(source)
+
bname = source[0:-3]; # strip off the .et suffix
if not SET_TARGET_TYPE(bld, name, 'ET'):
@@ -138,10 +150,12 @@ def HEIMDAL_ERRTABLE(name, source):
def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'):
'''rule for heimdal prototype generation'''
+ header = heimdal_path(header)
bld.set_group(group)
if options is None:
options='-q -P comment -o'
SET_TARGET_TYPE(bld, header, 'PROTOTYPE')
+ source = heimdal_paths(source)
t = bld(rule='${PERL} ${HEIMDAL}/cf/make-proto.pl ${OPTIONS} ${TGT[0].abspath(env)} ${SRC}',
source=source,
target=header,
@@ -160,10 +174,6 @@ def HEIMDAL_AUTOPROTO_PRIVATE(header, source):
def HEIMDAL_LIBRARY(libname, source, deps, vnum,
includes='',
cflags='',
- autoproto=None,
- autoproto_options=None,
- autoproto_extra='',
- autoproto_private=None,
is_bundled=True):
'''define a Heimdal library'''
@@ -210,12 +220,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum,
is_bundled = is_bundled,
)
- if autoproto is not None:
- HEIMDAL_AUTOPROTO(autoproto, source + ' ' + autoproto_extra,
- options=autoproto_options)
- if autoproto_private is not None:
- HEIMDAL_AUTOPROTO_PRIVATE(autoproto_private, source + ' ' + autoproto_extra)
-
def HEIMDAL_GENERATOR(name, rule, source='', target='',
group='generators'):
@@ -241,8 +245,6 @@ def HEIMDAL_SUBSYSTEM(modname, source,
includes='',
cflags='',
group='main',
- local_include=True,
- local_include_first=True,
use_hostcc=False,
use_global_deps=True):
'''define a Heimdal subsystem'''
@@ -250,7 +252,7 @@ def HEIMDAL_SUBSYSTEM(modname, source,
if not SET_TARGET_TYPE(bld, modname, 'SUBSYSTEM'):
return
- source = TO_LIST(source)
+ source = heimdal_paths(source)
bld.set_group(group)
@@ -262,8 +264,8 @@ def HEIMDAL_SUBSYSTEM(modname, source,
depends_on = '',
samba_deps = TO_LIST(deps),
samba_includes = includes,
- local_include = local_include,
- local_include_first = local_include_first,
+ local_include = True,
+ local_include_first = True,
samba_use_hostcc = use_hostcc,
samba_use_global_deps = use_global_deps
)
@@ -272,13 +274,11 @@ def HEIMDAL_SUBSYSTEM(modname, source,
def HEIMDAL_BINARY(binname, source,
deps='',
includes='',
- ldflags=None,
cflags='',
use_hostcc=False,
use_global_deps=True,
compiler=None,
group='binaries',
- local_include=True,
install=True,
install_path=None):
'''define a Samba binary'''
@@ -299,7 +299,6 @@ def HEIMDAL_BINARY(binname, source,
includes = includes,
cflags = cflags,
group = group,
- local_include = local_include,
use_hostcc = use_hostcc,
use_global_deps= use_global_deps)
@@ -316,7 +315,7 @@ def HEIMDAL_BINARY(binname, source,
samba_cflags = CURRENT_CFLAGS(bld, binname, cflags),
samba_deps = deps,
samba_includes = includes,
- local_include = local_include,
+ local_include = True,
top = True,
install_path = None,
samba_install = install
@@ -324,7 +323,7 @@ def HEIMDAL_BINARY(binname, source,
HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1',
- source='../heimdal/lib/gssapi/spnego/spnego.asn1',
+ source='lib/gssapi/spnego/spnego.asn1',
options='--sequence=MechTypeList',
includes='../heimdal/lib/asn1',
directory='lib/gssapi'
@@ -332,74 +331,60 @@ HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1',
HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1',
- '../heimdal/lib/gssapi/mech/gssapi.asn1',
+ 'lib/gssapi/mech/gssapi.asn1',
includes='../heimdal/lib/asn1',
directory='lib/gssapi'
)
HEIMDAL_ASN1('HEIMDAL_KRB5_ASN1',
- '../heimdal/lib/asn1/krb5.asn1',
- option_file='../heimdal/lib/asn1/krb5.opt',
+ 'lib/asn1/krb5.asn1',
+ option_file='lib/asn1/krb5.opt',
directory='lib/asn1'
)
HEIMDAL_ASN1('HEIMDAL_DIGEST_ASN1',
- '../heimdal/lib/asn1/digest.asn1',
+ 'lib/asn1/digest.asn1',
directory='lib/asn1'
)
HEIMDAL_ASN1('HEIMDAL_RFC2459_ASN1',
- '../heimdal/lib/asn1/rfc2459.asn1',
+ 'lib/asn1/rfc2459.asn1',
options='--preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints',
directory='lib/asn1'
)
HEIMDAL_ASN1('HEIMDAL_PKINIT_ASN1',
- '../heimdal/lib/asn1/pkinit.asn1',
+ 'lib/asn1/pkinit.asn1',
directory='lib/asn1'
)
HEIMDAL_ASN1('HEIMDAL_KX509_ASN1',
- '../heimdal/lib/asn1/kx509.asn1',
+ 'lib/asn1/kx509.asn1',
directory='lib/asn1'
)
-HEIMDAL_ASN1('HEIMDAL_HDB_ASN1',
- '../heimdal/lib/hdb/hdb.asn1',
- includes='../heimdal/lib/asn1')
-
-HEIMDAL_ERRTABLE('HEIMDAL_ASN1_ERR_ET',
- '../heimdal/lib/asn1/asn1_err.et')
-
-
-HEIMDAL_ERRTABLE('HEIMDAL_HDB_ERR_ET',
- '../heimdal/lib/hdb/hdb_err.et')
+HEIMDAL_ASN1('HEIMDAL_HDB_ASN1', 'lib/hdb/hdb.asn1',
+ includes='../heimdal/lib/asn1')
+HEIMDAL_ERRTABLE('HEIMDAL_ASN1_ERR_ET', 'lib/asn1/asn1_err.et')
-HEIMDAL_ERRTABLE('HEIMDAL_HEIM_ERR_ET',
- '../heimdal/lib/krb5/heim_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',
- '../heimdal/lib/krb5/k524_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_KRB_ERR_ET',
- '../heimdal/lib/krb5/krb_err.et')
+HEIMDAL_ERRTABLE('HEIMDAL_KRB5_ERR_ET', 'lib/krb5/krb5_err.et')
-
-HEIMDAL_ERRTABLE('HEIMDAL_KRB5_ERR_ET',
- '../heimdal/lib/krb5/krb5_err.et')
-
-
-HEIMDAL_ERRTABLE('HEIMDAL_GKRB5_ERR_ET',
- '../heimdal/lib/gssapi/krb5/gkrb5_err.et')
+HEIMDAL_ERRTABLE('HEIMDAL_GKRB5_ERR_ET', 'lib/gssapi/krb5/gkrb5_err.et')
if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
@@ -422,54 +407,54 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
)
ROKEN_HOSTCC_SOURCE = '''
- ../heimdal/lib/roken/base64.c
- ../heimdal/lib/roken/ct.c
- ../heimdal/lib/roken/hex.c
- ../heimdal/lib/roken/bswap.c
- ../heimdal/lib/roken/dumpdata.c
- ../heimdal/lib/roken/emalloc.c
- ../heimdal/lib/roken/ecalloc.c
- ../heimdal/lib/roken/getarg.c
- ../heimdal/lib/roken/get_window_size.c
- ../heimdal/lib/roken/getdtablesize.c
- ../heimdal/lib/roken/h_errno.c
- ../heimdal/lib/roken/issuid.c
- ../heimdal/lib/roken/net_read.c
- ../heimdal/lib/roken/net_write.c
- ../heimdal/lib/roken/parse_time.c
- ../heimdal/lib/roken/parse_units.c
- ../heimdal/lib/roken/signal.c
- ../heimdal/lib/roken/vis.c
- ../heimdal/lib/roken/strlwr.c
- ../heimdal/lib/roken/strsep_copy.c
- ../heimdal/lib/roken/strsep.c
- ../heimdal/lib/roken/strupr.c
- ../heimdal/lib/roken/strpool.c
- ../heimdal/lib/roken/estrdup.c
- ../heimdal/lib/roken/erealloc.c
- ../heimdal/lib/roken/simple_exec.c
- ../heimdal/lib/roken/strcollect.c
- ../heimdal/lib/roken/rtbl.c
- ../heimdal/lib/roken/cloexec.c
- ../heimdal/lib/roken/xfree.c
- replace.c
+ lib/roken/base64.c
+ lib/roken/ct.c
+ lib/roken/hex.c
+ lib/roken/bswap.c
+ lib/roken/dumpdata.c
+ lib/roken/emalloc.c
+ lib/roken/ecalloc.c
+ lib/roken/getarg.c
+ lib/roken/get_window_size.c
+ lib/roken/getdtablesize.c
+ lib/roken/h_errno.c
+ lib/roken/issuid.c
+ lib/roken/net_read.c
+ lib/roken/net_write.c
+ lib/roken/parse_time.c
+ lib/roken/parse_units.c
+ lib/roken/signal.c
+ lib/roken/vis.c
+ lib/roken/strlwr.c
+ lib/roken/strsep_copy.c
+ lib/roken/strsep.c
+ lib/roken/strupr.c
+ lib/roken/strpool.c
+ lib/roken/estrdup.c
+ lib/roken/erealloc.c
+ lib/roken/simple_exec.c
+ lib/roken/strcollect.c
+ lib/roken/rtbl.c
+ lib/roken/cloexec.c
+ lib/roken/xfree.c
+ ../heimdal_build/replace.c
'''
if not bld.CONFIG_SET('HAVE_GETPROGNAME'):
ROKEN_HOSTCC_SOURCE += '''
- ../heimdal/lib/roken/getprogname.c
- ../heimdal/lib/roken/setprogname.c
+ lib/roken/getprogname.c
+ lib/roken/setprogname.c
'''
if not bld.CONFIG_SET('HAVE_CLOSEFROM'):
ROKEN_HOSTCC_SOURCE += '''
- ../heimdal/lib/roken/closefrom.c
+ lib/roken/closefrom.c
'''
ROKEN_SOURCE = ROKEN_HOSTCC_SOURCE + '''
- ../heimdal/lib/roken/resolve.c
- ../heimdal/lib/roken/socket.c
- ../heimdal/lib/roken/roken_gethostby.c
+ lib/roken/resolve.c
+ lib/roken/socket.c
+ lib/roken/roken_gethostby.c
'''
HEIMDAL_LIBRARY('roken',
@@ -489,93 +474,95 @@ if not bld.CONFIG_SET('USING_SYSTEM_ROKEN'):
deps='LIBREPLACE_HOSTCC',
)
- HEIMDAL_BINARY('rkpty',
- '../heimdal/lib/roken/rkpty.c',
+ HEIMDAL_BINARY('rkpty', 'lib/roken/rkpty.c',
deps='roken OPENPTY',
cflags='-DPACKAGE="Samba"',
install=False
)
-HEIMDAL_LIBRARY('kdc',
- source='../heimdal/kdc/default_config.c ../heimdal/kdc/kerberos5.c ../heimdal/kdc/krb5tgs.c ../heimdal/kdc/pkinit.c ../heimdal/kdc/log.c ../heimdal/kdc/misc.c ../heimdal/kdc/kaserver.c ../heimdal/kdc/digest.c ../heimdal/kdc/process.c ../heimdal/kdc/windc.c ../heimdal/kdc/kx509.c',
+KDC_SOURCE='kdc/default_config.c kdc/kerberos5.c kdc/krb5tgs.c kdc/pkinit.c kdc/log.c kdc/misc.c kdc/kaserver.c kdc/digest.c kdc/process.c kdc/windc.c kdc/kx509.c'
+
+HEIMDAL_LIBRARY('kdc', source=KDC_SOURCE,
includes='../heimdal/kdc',
- autoproto='../heimdal/kdc/kdc-protos.h',
- autoproto_private='../heimdal/kdc/kdc-private.h',
deps='roken krb5 hdb asn1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO com_err wind',
vnum='2.0.0',
)
+HEIMDAL_AUTOPROTO('kdc/kdc-protos.h', KDC_SOURCE)
+HEIMDAL_AUTOPROTO_PRIVATE('kdc/kdc-private.h', KDC_SOURCE)
-
+HEIMNTLM_SOURCE = 'lib/ntlm/ntlm.c'
HEIMDAL_LIBRARY('heimntlm',
- source='../heimdal/lib/ntlm/ntlm.c',
+ source=HEIMNTLM_SOURCE,
includes='../heimdal/lib/ntlm',
- autoproto='../heimdal/lib/ntlm/heimntlm-protos.h',
deps='roken HEIMDAL_HCRYPTO krb5',
vnum='1.0.1',
)
+HEIMDAL_AUTOPROTO('lib/ntlm/heimntlm-protos.h', HEIMNTLM_SOURCE)
HEIMDAL_SUBSYSTEM('HEIMDAL_HDB_KEYS',
- '../heimdal/lib/hdb/keys.c',
+ 'lib/hdb/keys.c',
includes='../heimdal/lib/hdb',
deps='roken HEIMDAL_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',
- source='''../heimdal/lib/hdb/db.c ../heimdal/lib/hdb/dbinfo.c ../heimdal/lib/hdb/hdb.c
- ../heimdal/lib/hdb/ext.c ../heimdal/lib/hdb/keytab.c ../heimdal/lib/hdb/hdb-keytab.c
- ../heimdal/lib/hdb/mkey.c ../heimdal/lib/hdb/ndbm.c ../heimdal/lib/hdb/hdb_err.c
- hdb-glue.c''',
+ source=HDB_SOURCE,
includes='../heimdal/lib/hdb',
- autoproto='../heimdal/lib/hdb/hdb-protos.h',
- autoproto_private='../heimdal/lib/hdb/hdb-private.h',
deps='HDB_LDB krb5 HEIMDAL_HDB_KEYS roken HEIMDAL_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',
'''
-../heimdal/lib/gssapi/spnego/init_sec_context.c ../heimdal/lib/gssapi/spnego/external.c ../heimdal/lib/gssapi/spnego/compat.c
-../heimdal/lib/gssapi/spnego/context_stubs.c ../heimdal/lib/gssapi/spnego/cred_stubs.c ../heimdal/lib/gssapi/spnego/accept_sec_context.c
-../heimdal/lib/gssapi/krb5/copy_ccache.c ../heimdal/lib/gssapi/krb5/delete_sec_context.c ../heimdal/lib/gssapi/krb5/init_sec_context.c
-../heimdal/lib/gssapi/krb5/context_time.c ../heimdal/lib/gssapi/krb5/init.c ../heimdal/lib/gssapi/krb5/address_to_krb5addr.c
-../heimdal/lib/gssapi/krb5/get_mic.c ../heimdal/lib/gssapi/krb5/inquire_context.c ../heimdal/lib/gssapi/krb5/add_cred.c
-../heimdal/lib/gssapi/krb5/inquire_cred.c ../heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c ../heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c
-../heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c ../heimdal/lib/gssapi/krb5/inquire_names_for_mech.c ../heimdal/lib/gssapi/krb5/indicate_mechs.c
-../heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c ../heimdal/lib/gssapi/krb5/export_sec_context.c ../heimdal/lib/gssapi/krb5/import_sec_context.c
-../heimdal/lib/gssapi/krb5/duplicate_name.c ../heimdal/lib/gssapi/krb5/import_name.c ../heimdal/lib/gssapi/krb5/compare_name.c
-../heimdal/lib/gssapi/krb5/export_name.c ../heimdal/lib/gssapi/krb5/canonicalize_name.c ../heimdal/lib/gssapi/krb5/unwrap.c
-../heimdal/lib/gssapi/krb5/wrap.c ../heimdal/lib/gssapi/krb5/release_name.c ../heimdal/lib/gssapi/krb5/cfx.c
-../heimdal/lib/gssapi/krb5/8003.c ../heimdal/lib/gssapi/krb5/arcfour.c ../heimdal/lib/gssapi/krb5/encapsulate.c
-../heimdal/lib/gssapi/krb5/display_name.c ../heimdal/lib/gssapi/krb5/sequence.c ../heimdal/lib/gssapi/krb5/display_status.c
-../heimdal/lib/gssapi/krb5/release_buffer.c ../heimdal/lib/gssapi/krb5/external.c ../heimdal/lib/gssapi/krb5/compat.c
-../heimdal/lib/gssapi/krb5/creds.c ../heimdal/lib/gssapi/krb5/acquire_cred.c ../heimdal/lib/gssapi/krb5/release_cred.c
-../heimdal/lib/gssapi/krb5/store_cred.c ../heimdal/lib/gssapi/krb5/set_cred_option.c ../heimdal/lib/gssapi/krb5/decapsulate.c
-../heimdal/lib/gssapi/krb5/verify_mic.c ../heimdal/lib/gssapi/krb5/accept_sec_context.c ../heimdal/lib/gssapi/krb5/set_sec_context_option.c
-../heimdal/lib/gssapi/krb5/process_context_token.c ../heimdal/lib/gssapi/krb5/prf.c ../heimdal/lib/gssapi/krb5/aeap.c
-../heimdal/lib/gssapi/mech/context.c ../heimdal/lib/gssapi/mech/gss_krb5.c ../heimdal/lib/gssapi/mech/gss_mech_switch.c
-../heimdal/lib/gssapi/mech/gss_process_context_token.c ../heimdal/lib/gssapi/mech/gss_buffer_set.c
-../heimdal/lib/gssapi/mech/gss_aeap.c ../heimdal/lib/gssapi/mech/gss_add_cred.c ../heimdal/lib/gssapi/mech/gss_cred.c
-../heimdal/lib/gssapi/mech/gss_add_oid_set_member.c ../heimdal/lib/gssapi/mech/gss_compare_name.c ../heimdal/lib/gssapi/mech/gss_release_oid_set.c
-../heimdal/lib/gssapi/mech/gss_create_empty_oid_set.c ../heimdal/lib/gssapi/mech/gss_decapsulate_token.c ../heimdal/lib/gssapi/mech/gss_inquire_cred_by_oid.c
-../heimdal/lib/gssapi/mech/gss_canonicalize_name.c ../heimdal/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c ../heimdal/lib/gssapi/mech/gss_inquire_names_for_mech.c
-../heimdal/lib/gssapi/mech/gss_inquire_mechs_for_name.c ../heimdal/lib/gssapi/mech/gss_wrap_size_limit.c ../heimdal/lib/gssapi/mech/gss_names.c
-../heimdal/lib/gssapi/mech/gss_verify.c ../heimdal/lib/gssapi/mech/gss_display_name.c
-../heimdal/lib/gssapi/mech/gss_duplicate_oid.c ../heimdal/lib/gssapi/mech/gss_display_status.c ../heimdal/lib/gssapi/mech/gss_release_buffer.c
-../heimdal/lib/gssapi/mech/gss_release_oid.c ../heimdal/lib/gssapi/mech/gss_test_oid_set_member.c
-../heimdal/lib/gssapi/mech/gss_release_cred.c
-../heimdal/lib/gssapi/mech/gss_set_sec_context_option.c ../heimdal/lib/gssapi/mech/gss_export_name.c ../heimdal/lib/gssapi/mech/gss_seal.c
-../heimdal/lib/gssapi/mech/gss_acquire_cred.c ../heimdal/lib/gssapi/mech/gss_unseal.c ../heimdal/lib/gssapi/mech/gss_verify_mic.c
-../heimdal/lib/gssapi/mech/gss_accept_sec_context.c ../heimdal/lib/gssapi/mech/gss_inquire_cred_by_mech.c ../heimdal/lib/gssapi/mech/gss_indicate_mechs.c
-../heimdal/lib/gssapi/mech/gss_delete_sec_context.c ../heimdal/lib/gssapi/mech/gss_sign.c ../heimdal/lib/gssapi/mech/gss_utils.c
-../heimdal/lib/gssapi/mech/gss_init_sec_context.c ../heimdal/lib/gssapi/mech/gss_oid_equal.c ../heimdal/lib/gssapi/mech/gss_oid_to_str.c
-../heimdal/lib/gssapi/mech/gss_context_time.c ../heimdal/lib/gssapi/mech/gss_encapsulate_token.c ../heimdal/lib/gssapi/mech/gss_get_mic.c
-../heimdal/lib/gssapi/mech/gss_import_sec_context.c ../heimdal/lib/gssapi/mech/gss_inquire_cred.c ../heimdal/lib/gssapi/mech/gss_wrap.c
-../heimdal/lib/gssapi/mech/gss_import_name.c ../heimdal/lib/gssapi/mech/gss_duplicate_name.c ../heimdal/lib/gssapi/mech/gss_unwrap.c
-../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''',
+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_to_str.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='HEIMDAL_HCRYPTO asn1 HEIMDAL_SPNEGO_ASN1 HEIMDAL_GSSAPI_ASN1 roken krb5 com_err wind',
vnum='2.0.0',
@@ -583,15 +570,13 @@ HEIMDAL_LIBRARY('gssapi',
--
Samba Shared Repository
More information about the samba-cvs
mailing list