The branch, master has been updated via 5548d3d Add missing dependencies for com_err. via 6ea99a2 ldb: Refer to ldb(3), not ldb(7). via c8b6be0 heimdal-build: Simplify calls to convenience functions. via 3c0a57a heimdal-build: Add HEIMDAL_BINARY convenience method. via e9224c6 heimdal-build: Implement HEIMDAL_LIBRARY with fewer wafsamba functions. via 6c81cae heimdal-build: Add heimdal specific subsystem function. via 017196a heimdal-build: Add custom heimdal generator. via 9eab95b heimdal: Fix name of hx509 library. via 39f9bfd heimdal: Fix name of kdc library. via 1db3221 heimdal: Fix name of 'hdb'. via 7b18839 heimdal: Fix library name of heimntlm. via 9b18d48 heimdal: Fix library name of gssapi. via 14a1133 heimdal: Fix names of roken, wind libraries. from d09cfc0 unittests: add a test to avoid regression on previous fix
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 5548d3d41e3db378802e614656d3f708a3edd214 Author: Jelmer Vernooij <jel...@samba.org> Date: Tue Oct 5 00:36:21 2010 +0200 Add missing dependencies for com_err. commit 6ea99a237d982827accd1e9befe133141083d9cb Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 21:19:47 2010 +0200 ldb: Refer to ldb(3), not ldb(7). commit c8b6be016a0352d50c9f384cde51bde90227ba58 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 18:05:00 2010 +0200 heimdal-build: Simplify calls to convenience functions. commit 3c0a57a99c2c5bc4f7f48ced24e41ec57c6349a2 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 17:17:00 2010 +0200 heimdal-build: Add HEIMDAL_BINARY convenience method. commit e9224c6bd12b02d9dd85a18efe59ce51396d460a Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 16:48:34 2010 +0200 heimdal-build: Implement HEIMDAL_LIBRARY with fewer wafsamba functions. commit 6c81caedf618b742faed822c38c7c653fe95a37e Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 16:27:16 2010 +0200 heimdal-build: Add heimdal specific subsystem function. commit 017196ad8501bd44bbfedfff9c8e24d801426df7 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 16:19:29 2010 +0200 heimdal-build: Add custom heimdal generator. commit 9eab95bd08cf63b63de63ed8dc88ca3a40345b19 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 16:14:10 2010 +0200 heimdal: Fix name of hx509 library. commit 39f9bfde394e9f2408ba11a40267de9c3a6e119e Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 16:03:21 2010 +0200 heimdal: Fix name of kdc library. commit 1db3221c9433dc602ea250d7126f279d77821064 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 16:00:17 2010 +0200 heimdal: Fix name of 'hdb'. commit 7b188397afc746a11bea70954a6350fa9738ead0 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 15:56:42 2010 +0200 heimdal: Fix library name of heimntlm. commit 9b18d48d51ecb7c3350a8950b7928662852b056e Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 15:54:07 2010 +0200 heimdal: Fix library name of gssapi. commit 14a11337f0723ed36939cfd9114a8f49f3a3a9ff Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 4 15:50:05 2010 +0200 heimdal: Fix names of roken, wind libraries. ----------------------------------------------------------------------- Summary of changes: source4/auth/credentials/wscript_build | 2 +- source4/auth/gensec/wscript_build | 3 +- source4/auth/kerberos/wscript_build | 2 +- source4/dsdb/samdb/ldb_modules/wscript_build | 4 +- source4/dsdb/wscript_build | 6 +- source4/heimdal_build/wscript_build | 406 +++++++++++++++++--------- source4/kdc/wscript_build | 30 +- source4/lib/ldb/man/ldbadd.1.xml | 6 +- source4/lib/ldb/man/ldbdel.1.xml | 6 +- source4/lib/ldb/man/ldbedit.1.xml | 2 +- source4/lib/ldb/man/ldbmodify.1.xml | 4 +- source4/lib/ldb/man/ldbrename.1.xml | 4 +- source4/lib/ldb/man/ldbsearch.1.xml | 4 +- source4/lib/ldb/pyldb.c | 2 + source4/lib/ldb/tests/python/api.py | 6 + source4/lib/ldb/wscript | 3 +- source4/libnet/wscript_build | 2 +- source4/ntvfs/wscript_build | 2 +- source4/rpc_server/wscript_build | 2 +- source4/smbd/wscript_build | 2 +- source4/torture/wscript_build | 2 +- 21 files changed, 326 insertions(+), 174 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build index bfe9cd0..fad29c8 100644 --- a/source4/auth/credentials/wscript_build +++ b/source4/auth/credentials/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS', source='credentials.c credentials_files.c credentials_ntlm.c credentials_krb5.c ../kerberos/kerberos_util.c', autoproto='credentials_proto.h', - public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB HEIMDAL_GSSAPI', + public_deps='LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB gssapi com_err', public_headers='credentials.h', deps='SECRETS SAMDB' ) diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build index 38c0e15..cf3d783 100644 --- a/source4/auth/gensec/wscript_build +++ b/source4/auth/gensec/wscript_build @@ -6,6 +6,7 @@ bld.SAMBA_LIBRARY('gensec', autoproto='gensec_proto.h', public_deps='CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba_socket LIBPACKET LIBTSOCKET UTIL_TEVENT', public_headers='gensec.h', + deps='com_err', vnum='0.0.1' ) @@ -22,7 +23,7 @@ bld.SAMBA_MODULE('gensec_gssapi', source='gensec_gssapi.c', subsystem='gensec', init_function='gensec_gssapi_init', - deps='HEIMDAL_GSSAPI CREDENTIALS KERBEROS' + deps='gssapi CREDENTIALS KERBEROS' ) diff --git a/source4/auth/kerberos/wscript_build b/source4/auth/kerberos/wscript_build index 4cb9d79..0c1828a 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 com_err', 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 e455ae9..b59fce3 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 com_err' ) @@ -212,7 +212,7 @@ bld.SAMBA_MODULE('ldb_update_keytab', subsystem='ldb', init_function='LDB_MODULE(update_keytab)', internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'), - deps='talloc LIBEVENTS CREDENTIALS ldb' + deps='talloc LIBEVENTS CREDENTIALS ldb com_err' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 3c2742d..784d93b 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -5,8 +5,8 @@ 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', - 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' + 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 com_err' ) @@ -54,6 +54,6 @@ bld.SAMBA_PYTHON('python_dsdb', # the dependency on dcerpc here is because gensec # depends on dcerpc but the waf circular dependency finder # removes it so we end up with unresolved symbols. - deps='SAMDB pyldb_util dcerpc', + deps='SAMDB pyldb_util dcerpc com_err', realname='samba/dsdb.so' ) diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 257796f..2b08dce 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -1,13 +1,12 @@ #!/usr/bin/env python -import Build 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_ASN1(bld, name, source, +def HEIMDAL_ASN1(name, source, options='', directory='', option_file=None, @@ -23,7 +22,7 @@ def HEIMDAL_ASN1(bld, name, source, # for ASN1 compilation, I always put it in build_source, as it doesn't make # sense elsewhere - bld.SET_BUILD_GROUP('build_source') + bld.set_group('build_source') out_files = [] out_files.append("../heimdal/%s/asn1_%s_asn1.x" % (directory, bname)) @@ -94,7 +93,7 @@ def HEIMDAL_ASN1(bld, name, source, depends_on = name + '_ASN1', name = name + '_PRIV_H') - bld.SET_BUILD_GROUP('main') + bld.set_group('main') includes = TO_LIST(includes) includes.append(os.path.dirname(out_files[0])) @@ -104,13 +103,12 @@ def HEIMDAL_ASN1(bld, name, source, target = name, samba_cflags = CURRENT_CFLAGS(bld, name, ''), depends_on = '', - samba_deps = TO_LIST('HEIMDAL_ROKEN'), + samba_deps = TO_LIST('roken'), samba_includes = includes, local_include = True) -Build.BuildContext.HEIMDAL_ASN1 = HEIMDAL_ASN1 -def HEIMDAL_ERRTABLE(bld, name, source): +def HEIMDAL_ERRTABLE(name, source): '''Build a heimdal errtable from a .et file''' bname = source[0:-3]; # strip off the .et suffix @@ -118,7 +116,7 @@ def HEIMDAL_ERRTABLE(bld, name, source): if not SET_TARGET_TYPE(bld, name, 'ET'): return - bld.SET_BUILD_GROUP('build_source') + bld.set_group('build_source') out_files = [] out_files.append('%s.c' % bname) @@ -137,11 +135,10 @@ def HEIMDAL_ERRTABLE(bld, name, source): source = sources, target = out_files, name = name) -Build.BuildContext.HEIMDAL_ERRTABLE = HEIMDAL_ERRTABLE -def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'): +def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'): '''rule for heimdal prototype generation''' - bld.SET_BUILD_GROUP(group) + bld.set_group(group) if options is None: options='-q -P comment -o' SET_TARGET_TYPE(bld, header, 'PROTOTYPE') @@ -153,34 +150,180 @@ def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'): before='cc') t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal') t.env.OPTIONS = options -Build.BuildContext.HEIMDAL_AUTOPROTO = HEIMDAL_AUTOPROTO -def HEIMDAL_AUTOPROTO_PRIVATE(bld, header, source): +def HEIMDAL_AUTOPROTO_PRIVATE(header, source): '''rule for private heimdal prototype generation''' - bld.HEIMDAL_AUTOPROTO(header, source, options='-q -P comment -p') -Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE = HEIMDAL_AUTOPROTO_PRIVATE + HEIMDAL_AUTOPROTO(header, source, options='-q -P comment -p') -def HEIMDAL_LIBRARY(bld, libname, source, deps, +def HEIMDAL_LIBRARY(libname, source, deps, includes='', - public_deps='', cflags='', - heimdal_autoproto=None, - heimdal_autoproto_options=None, - heimdal_autoproto_private=None): - bld.SAMBA_LIBRARY(libname=libname, source=source, deps=deps, - public_deps=public_deps, cflags=cflags, includes=includes, - is_bundled=True) - if heimdal_autoproto is not None: - bld.HEIMDAL_AUTOPROTO(heimdal_autoproto, source, - options=heimdal_autoproto_options) - if heimdal_autoproto_private is not None: - bld.HEIMDAL_AUTOPROTO_PRIVATE(heimdal_autoproto_private, source) - -Build.BuildContext.HEIMDAL_LIBRARY = HEIMDAL_LIBRARY - -bld.SAMBA_GENERATOR( + vnum=None, + autoproto=None, + autoproto_options=None, + autoproto_private=None, + is_bundled=True): + '''define a Heimdal library''' + + obj_target = libname + '.objlist' + + # first create a target for building the object files for this library + # by separating in this way, we avoid recompiling the C files + # separately for the install library and the build library + HEIMDAL_SUBSYSTEM(obj_target, + source = source, + deps = deps, + includes = includes, + cflags = cflags, + group = 'main') + + if not SET_TARGET_TYPE(bld, libname, "LIBRARY"): + return + + # the library itself will depend on that object target + deps = TO_LIST(deps) + deps.append(obj_target) + + if not is_bundled: + # Sanitize the library name + bundled_name = libname.lower().replace('_', '-') + while bundled_name.startswith("lib"): + bundled_name = bundled_name[3:] + else: + bundled_name = libname + '-samba4' + + features = 'cc cshlib symlink_lib install_lib' + + bld.set_group('main') + t = bld( + features = features, + source = [], + target = bundled_name, + samba_cflags = CURRENT_CFLAGS(bld, libname, cflags), + samba_deps = deps, + samba_includes = includes, + vnum = vnum, + install_path = None, + name = libname, + is_bundled = is_bundled, + ) + + if autoproto is not None: + HEIMDAL_AUTOPROTO(autoproto, source, + options=autoproto_options) + if autoproto_private is not None: + HEIMDAL_AUTOPROTO_PRIVATE(autoproto_private, source) + + +def HEIMDAL_GENERATOR(name, rule, source='', target='', + group='generators'): + '''A generic source generator target''' + + if not SET_TARGET_TYPE(bld, name, 'GENERATOR'): + return + + bld.set_group(group) + return bld( + rule=rule, + source=source, + target=target, + shell=isinstance(rule, str), + on_results=True, + before='cc', + ext_out='.c', + name=name) + + +def HEIMDAL_SUBSYSTEM(modname, source, + deps='', + includes='', + cflags='', + group='main', + local_include=True, + local_include_first=True, + use_hostcc=False, + use_global_deps=True): + '''define a Heimdal subsystem''' + + if not SET_TARGET_TYPE(bld, modname, 'SUBSYSTEM'): + return + + source = TO_LIST(source) + + bld.set_group(group) + + return bld( + features = 'cc', + source = source, + target = modname, + samba_cflags = CURRENT_CFLAGS(bld, modname, cflags), + depends_on = '', + samba_deps = TO_LIST(deps), + samba_includes = includes, + local_include = local_include, + local_include_first = local_include_first, + samba_use_hostcc = use_hostcc, + samba_use_global_deps = use_global_deps + ) + + +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''' + + if not SET_TARGET_TYPE(bld, binname, 'BINARY'): + return + + features = 'cc cprogram symlink_bin install_bin' + + obj_target = binname + '.objlist' + + # first create a target for building the object files for this binary + # by separating in this way, we avoid recompiling the C files + # separately for the install binary and the build binary + HEIMDAL_SUBSYSTEM(obj_target, + source = source, + deps = deps, + includes = includes, + cflags = cflags, + group = group, + local_include = local_include, + use_hostcc = use_hostcc, + use_global_deps= use_global_deps) + + bld.set_group(group) + + # the binary itself will depend on that object target + deps = TO_LIST(deps) + deps.append(obj_target) + + t = bld( + features = features, + source = [], + target = binname, + samba_cflags = CURRENT_CFLAGS(bld, binname, cflags), + samba_deps = deps, + samba_includes = includes, + local_include = local_include, + top = True, + install_path = None, + samba_install = install + ) + + +HEIMDAL_GENERATOR( name="HEIMDAL_ERRORLIST", rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()} ${SRC[1].parent.abspath(env)}", source = '../heimdal/lib/wind/gen-errorlist.py ../heimdal/lib/wind/rfc3454.txt ../heimdal/lib/wind/stringprep.py', @@ -188,21 +331,21 @@ bld.SAMBA_GENERATOR( ) -bld.SAMBA_GENERATOR( +HEIMDAL_GENERATOR( name = 'HEIMDAL_NORMALIZE_TABLE', rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()} ${SRC[2].abspath()} ${SRC[1].parent.abspath(env)}", source = '../heimdal/lib/wind/gen-normalize.py ../heimdal/lib/wind/UnicodeData.txt ../heimdal/lib/wind/CompositionExclusions-3.2.0.txt', target = '../heimdal/lib/wind/normalize_table.h ../heimdal/lib/wind/normalize_table.c' ) -bld.SAMBA_GENERATOR( +HEIMDAL_GENERATOR( name = 'HEIMDAL_COMBINING_TABLE', rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()} ${SRC[1].parent.abspath(env)}", source = '../heimdal/lib/wind/gen-combining.py ../heimdal/lib/wind/UnicodeData.txt', target = '../heimdal/lib/wind/combining_table.h ../heimdal/lib/wind/combining_table.c' ) -bld.SAMBA_GENERATOR( +HEIMDAL_GENERATOR( name = 'HEIMDAL_BIDI_TABLE', rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()} ${SRC[1].parent.abspath(env)}", source = '../heimdal/lib/wind/gen-bidi.py ../heimdal/lib/wind/rfc3454.txt', @@ -210,7 +353,7 @@ bld.SAMBA_GENERATOR( ) -bld.SAMBA_GENERATOR( +HEIMDAL_GENERATOR( name = 'HEIMDAL_MAP_TABLE', rule="${PYTHON} ${SRC[0].abspath()} ${SRC[2].abspath()} ${SRC[2].parent.abspath(env)}", source = '../heimdal/lib/wind/gen-map.py ../heimdal/lib/wind/stringprep.py ../heimdal/lib/wind/rfc3454.txt', @@ -218,7 +361,7 @@ bld.SAMBA_GENERATOR( ) -bld.HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1', +HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1', source='../heimdal/lib/gssapi/spnego/spnego.asn1', options='--sequence=MechTypeList', includes='../heimdal/lib/asn1', @@ -226,65 +369,65 @@ bld.HEIMDAL_ASN1('HEIMDAL_SPNEGO_ASN1', ) -bld.HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1', +HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1', '../heimdal/lib/gssapi/mech/gssapi.asn1', includes='../heimdal/lib/asn1', directory='lib/gssapi' ) -bld.HEIMDAL_ASN1('HEIMDAL_KRB5_ASN1', +HEIMDAL_ASN1('HEIMDAL_KRB5_ASN1', '../heimdal/lib/asn1/krb5.asn1', option_file='../heimdal/lib/asn1/krb5.opt', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_DIGEST_ASN1', +HEIMDAL_ASN1('HEIMDAL_DIGEST_ASN1', '../heimdal/lib/asn1/digest.asn1', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_PKCS8_ASN1', +HEIMDAL_ASN1('HEIMDAL_PKCS8_ASN1', '../heimdal/lib/asn1/pkcs8.asn1', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_PKCS9_ASN1', +HEIMDAL_ASN1('HEIMDAL_PKCS9_ASN1', '../heimdal/lib/asn1/pkcs9.asn1', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_PKCS12_ASN1', +HEIMDAL_ASN1('HEIMDAL_PKCS12_ASN1', '../heimdal/lib/asn1/pkcs12.asn1', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_RFC2459_ASN1', +HEIMDAL_ASN1('HEIMDAL_RFC2459_ASN1', '../heimdal/lib/asn1/rfc2459.asn1', options='--preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_PKINIT_ASN1', +HEIMDAL_ASN1('HEIMDAL_PKINIT_ASN1', '../heimdal/lib/asn1/pkinit.asn1', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_CMS_ASN1', +HEIMDAL_ASN1('HEIMDAL_CMS_ASN1', '../heimdal/lib/asn1/cms.asn1', option_file='../heimdal/lib/asn1/cms.opt', directory='lib/asn1' ) -bld.HEIMDAL_ASN1('HEIMDAL_OCSP_ASN1', +HEIMDAL_ASN1('HEIMDAL_OCSP_ASN1', '../heimdal/lib/hx509/ocsp.asn1', options='--preserve-binary=OCSPTBSRequest --preserve-binary=OCSPResponseData', includes='../heimdal/lib/asn1', @@ -292,13 +435,13 @@ bld.HEIMDAL_ASN1('HEIMDAL_OCSP_ASN1', ) -bld.HEIMDAL_ASN1('HEIMDAL_KX509_ASN1', +HEIMDAL_ASN1('HEIMDAL_KX509_ASN1', '../heimdal/lib/asn1/kx509.asn1', directory='lib/asn1' ) -- Samba Shared Repository