[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Fri Dec 17 17:34:02 MST 2010
The branch, master has been updated
via 6967cf2 ldb: Rename controls_except_specified -> ldb_controls_except_specified.
via e338bbd ldb_map: Fix prefix for map functions.
via 24faeab ldb: Rename last instance of save_controls -> ldb_save_controls.
via 6b5a0cf ldb: Add prototype for ldb_init_module.
via fff18e0 ldb: Rename two exported functions so they match abi_match.
via f9fbe08 pidl: Use system pytalloc if possible.
via 502fe68 Add bzrignore symlink.
via 2d1e91f wafsamba: Use abi_match in version script files.
via 03fbf9e heimdal_build: Simplify HEIMDAL_LIBRARY - version_script files are now taken from upstream rather than generated.
via 2f75b53 heimdal_build: Add version-script for heimdal_base, hx509 and hcrypto. Convert hbase and hcrypto to libraries.
from 839fe07 s4-drepl: Reference current Schema cache into working_schema context
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6967cf27eb94f9097c302bc2807f430ca4a641f2
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 18 00:43:24 2010 +0100
ldb: Rename controls_except_specified -> ldb_controls_except_specified.
Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
Autobuild-Date: Sat Dec 18 01:33:24 CET 2010 on sn-devel-104
commit e338bbd45030cade0c540d5ea71f60f899143c09
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 18 00:30:22 2010 +0100
ldb_map: Fix prefix for map functions.
commit 24faeab4c5f97930cced7590fabfa6361402344b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 18 00:12:17 2010 +0100
ldb: Rename last instance of save_controls -> ldb_save_controls.
commit 6b5a0cf6303dd760304619cf8fb1b4b33afcceaa
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Dec 18 00:11:36 2010 +0100
ldb: Add prototype for ldb_init_module.
commit fff18e0cc38dca018c44696a93fcd7356a823bba
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 17 23:00:46 2010 +0100
ldb: Rename two exported functions so they match abi_match.
commit f9fbe0874f9ef5fe70892d68749292821f4f4682
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 17 23:00:31 2010 +0100
pidl: Use system pytalloc if possible.
commit 502fe681167cb8f445b9d07d447d84c19b617f8d
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 17 22:37:04 2010 +0100
Add bzrignore symlink.
commit 2d1e91fd0cfe4c20de06d420469241c2ca6287a1
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 17 22:23:52 2010 +0100
wafsamba: Use abi_match in version script files.
commit 03fbf9ea0babcaca3e751fa6d96981ef1e3805e7
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 17 21:53:42 2010 +0100
heimdal_build: Simplify HEIMDAL_LIBRARY - version_script files are now taken from upstream rather than generated.
commit 2f75b53e8058f80dd7e5cba61e55271f40a8a338
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 17 21:51:21 2010 +0100
heimdal_build: Add version-script for heimdal_base, hx509 and hcrypto. Convert hbase and hcrypto to libraries.
-----------------------------------------------------------------------
Summary of changes:
.bzrignore | 1 +
buildtools/wafsamba/samba_abi.py | 23 ++-
buildtools/wafsamba/wafsamba.py | 3 +-
pidl/lib/Parse/Pidl/Samba4/Python.pm | 2 +-
source4/dsdb/samdb/ldb_modules/partition.c | 2 +-
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 4 +-
source4/heimdal/lib/hx509/version-script.map | 244 +++++++++++++++++++++++
source4/heimdal_build/wscript_build | 98 ++++-----
source4/lib/ldb/common/ldb_controls.c | 6 +-
source4/lib/ldb/include/ldb_module.h | 12 +-
source4/lib/ldb/ldb_map/ldb_map.h | 20 +-
source4/lib/ldb/ldb_map/ldb_map_inbound.c | 8 +-
source4/lib/ldb/ldb_map/ldb_map_outbound.c | 2 +-
source4/lib/ldb/ldb_sqlite3/ldb_sqlite3.c | 2 +-
source4/lib/ldb/modules/asq.c | 2 +-
source4/lib/ldb/modules/paged_results.c | 2 +-
source4/lib/ldb/modules/sort.c | 2 +-
17 files changed, 341 insertions(+), 92 deletions(-)
create mode 120000 .bzrignore
create mode 100644 source4/heimdal/lib/hx509/version-script.map
Changeset truncated at 500 lines:
diff --git a/.bzrignore b/.bzrignore
new file mode 120000
index 0000000..3e4e48b
--- /dev/null
+++ b/.bzrignore
@@ -0,0 +1 @@
+.gitignore
\ No newline at end of file
diff --git a/buildtools/wafsamba/samba_abi.py b/buildtools/wafsamba/samba_abi.py
index a4c9f68..bd074f8 100644
--- a/buildtools/wafsamba/samba_abi.py
+++ b/buildtools/wafsamba/samba_abi.py
@@ -136,7 +136,6 @@ def abi_check(self):
tsk.ABI_GEN = abi_gen
-
def abi_process_file(fname, version, symmap):
'''process one ABI file, adding new symbols to the symmap'''
f = open(fname, mode='r')
@@ -146,7 +145,7 @@ def abi_process_file(fname, version, symmap):
symmap[symname] = version
f.close()
-def abi_write_vscript(vscript, libname, version, symmap):
+def abi_write_vscript(vscript, libname, version, symmap, abi_match):
'''write a vscript file for a library in --version-script format'''
invmap = {}
@@ -164,7 +163,13 @@ def abi_write_vscript(vscript, libname, version, symmap):
f.write("\t\t%s;\n" % s);
f.write("}%s;\n\n" % last_key)
last_key = " %s" % symver
- f.write("%s { global: *;};\n" % version)
+ f.write("%s {\n" % version)
+ f.write("\tglobal:\n")
+ for x in abi_match:
+ f.write("\t\t%s;\n" % x)
+ if abi_match != ["*"]:
+ f.write("\tlocal: *;\n")
+ f.write("};\n")
f.close()
@@ -180,10 +185,11 @@ def abi_build_vscript(task):
basename = os.path.basename(fname)
version = basename[len(task.env.LIBNAME)+1:-len(".sigs")]
abi_process_file(fname, version, symmap)
- abi_write_vscript(tgt, task.env.LIBNAME, task.env.VERSION, symmap)
+ abi_write_vscript(tgt, task.env.LIBNAME, task.env.VERSION, symmap,
+ task.env.ABI_MATCH)
-def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript):
+def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript, abi_match=None):
'''generate a vscript file for our public libraries'''
if abi_directory:
source = bld.path.ant_glob('%s/%s-[0-9]*.sigs' % (abi_directory, libname))
@@ -199,7 +205,12 @@ def ABI_VSCRIPT(bld, libname, abi_directory, version, vscript):
source=source,
group='vscripts',
target=vscript)
+ if abi_match is None:
+ abi_match = ["*"]
+ else:
+ abi_match = samba_utils.TO_LIST(abi_match)
+ t.env.ABI_MATCH = abi_match
t.env.VERSION = version
t.env.LIBNAME = libname
- t.vars = ['LIBNAME', 'VERSION']
+ t.vars = ['LIBNAME', 'VERSION', 'ABI_MATCH']
Build.BuildContext.ABI_VSCRIPT = ABI_VSCRIPT
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 9204104..c532c4b 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -212,7 +212,8 @@ def SAMBA_LIBRARY(bld, libname, source,
version = None
if version:
vscript = "%s.vscript" % libname
- bld.ABI_VSCRIPT(libname, abi_directory, version, vscript)
+ bld.ABI_VSCRIPT(libname, abi_directory, version, vscript,
+ abi_match)
fullname = bld.env.shlib_PATTERN % bundled_name
bld.add_manual_dependency(bld.path.find_or_declare(fullname), bld.path.find_or_declare(vscript))
if Options.is_install:
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 8fdb66a..09ebd57 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -1284,7 +1284,7 @@ sub Parse($$$$$)
/* Python wrapper functions auto-generated by pidl */
#include <Python.h>
#include \"includes.h\"
-#include \"lib/talloc/pytalloc.h\"
+#include <pytalloc.h>
#include \"librpc/rpc/pyrpc.h\"
#include \"librpc/rpc/pyrpc_util.h\"
#include \"$hdr\"
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 5163726..244b679 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -493,7 +493,7 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
/* Remove the "domain_scope" control, so we don't confuse a backend
* server */
- if (domain_scope_control && !save_controls(domain_scope_control, req, &saved_controls)) {
+ if (domain_scope_control && !ldb_save_controls(domain_scope_control, req, &saved_controls)) {
return ldb_oom(ldb_module_get_ctx(module));
}
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 2bdb7af..28aef32 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -369,7 +369,7 @@ static int replmd_op_callback(struct ldb_request *req, struct ldb_reply *ares)
partition_ctrl = ldb_reply_get_control(ares, DSDB_CONTROL_CURRENT_PARTITION_OID);
/* Remove the 'partition' control from what we pass up the chain */
- controls = controls_except_specified(ares->controls, ares, partition_ctrl);
+ controls = ldb_controls_except_specified(ares->controls, ares, partition_ctrl);
if (ares->error != LDB_SUCCESS) {
return ldb_module_done(ac->req, controls,
@@ -438,7 +438,7 @@ static int replmd_op_callback(struct ldb_request *req, struct ldb_reply *ares)
* eventually with the ares */
talloc_free(partition_ctrl);
return ldb_module_done(ac->req,
- controls_except_specified(controls, ares, partition_ctrl),
+ ldb_controls_except_specified(controls, ares, partition_ctrl),
ares->response, LDB_SUCCESS);
}
}
diff --git a/source4/heimdal/lib/hx509/version-script.map b/source4/heimdal/lib/hx509/version-script.map
new file mode 100644
index 0000000..c0666d8
--- /dev/null
+++ b/source4/heimdal/lib/hx509/version-script.map
@@ -0,0 +1,244 @@
+# $Id$
+
+HEIMDAL_X509_1.2 {
+ global:
+ _hx509_cert_assign_key;
+ _hx509_cert_private_key;
+ _hx509_certs_keys_free;
+ _hx509_certs_keys_get;
+ _hx509_expr_eval;
+ _hx509_expr_free;
+ _hx509_expr_parse;
+ _hx509_generate_private_key;
+ _hx509_generate_private_key_bits;
+ _hx509_generate_private_key_free;
+ _hx509_generate_private_key_init;
+ _hx509_generate_private_key_is_ca;
+ _hx509_map_file_os;
+ _hx509_name_from_Name;
+ _hx509_private_key2SPKI;
+ _hx509_private_key_free;
+ _hx509_private_key_ref;
+ _hx509_request_add_dns_name;
+ _hx509_request_add_email;
+ _hx509_request_free;
+ _hx509_request_get_SubjectPublicKeyInfo;
+ _hx509_request_get_name;
+ _hx509_request_init;
+ _hx509_request_parse;
+ _hx509_request_print;
+ _hx509_request_set_SubjectPublicKeyInfo;
+ _hx509_request_set_email;
+ _hx509_request_set_name;
+ _hx509_request_to_pkcs10;
+ _hx509_request_to_pkcs10;
+ _hx509_unmap_file_os;
+ _hx509_write_file;
+ hx509_bitstring_print;
+ hx509_ca_sign;
+ hx509_ca_sign_self;
+ hx509_ca_tbs_add_crl_dp_uri;
+ hx509_ca_tbs_add_eku;
+ hx509_ca_tbs_add_san_hostname;
+ hx509_ca_tbs_add_san_jid;
+ hx509_ca_tbs_add_san_ms_upn;
+ hx509_ca_tbs_add_san_otherName;
+ hx509_ca_tbs_add_san_pkinit;
+ hx509_ca_tbs_add_san_rfc822name;
+ hx509_ca_tbs_free;
+ hx509_ca_tbs_init;
+ hx509_ca_tbs_set_ca;
+ hx509_ca_tbs_set_domaincontroller;
+ hx509_ca_tbs_set_notAfter;
+ hx509_ca_tbs_set_notAfter_lifetime;
+ hx509_ca_tbs_set_notBefore;
+ hx509_ca_tbs_set_proxy;
+ hx509_ca_tbs_set_serialnumber;
+ hx509_ca_tbs_set_spki;
+ hx509_ca_tbs_set_subject;
+ hx509_ca_tbs_set_template;
+ hx509_ca_tbs_set_unique;
+ hx509_ca_tbs_subject_expand;
+ hx509_ca_tbs_template_units;
+ hx509_cert;
+ hx509_cert_attribute;
+ hx509_cert_binary;
+ hx509_cert_check_eku;
+ hx509_cert_cmp;
+ hx509_cert_find_subjectAltName_otherName;
+ hx509_cert_free;
+ hx509_cert_get_SPKI;
+ hx509_cert_get_SPKI_AlgorithmIdentifier;
+ hx509_cert_get_attribute;
+ hx509_cert_get_base_subject;
+ hx509_cert_get_friendly_name;
+ hx509_cert_get_issuer;
+ hx509_cert_get_notAfter;
+ hx509_cert_get_notBefore;
+ hx509_cert_get_serialnumber;
+ hx509_cert_get_subject;
+ hx509_cert_get_issuer_unique_id;
+ hx509_cert_get_subject_unique_id;
+ hx509_cert_init;
+ hx509_cert_init_data;
+ hx509_cert_keyusage_print;
+ hx509_cert_ref;
+ hx509_cert_set_friendly_name;
+ hx509_certs_add;
+ hx509_certs_append;
+ hx509_certs_end_seq;
+ hx509_certs_ref;
+ hx509_certs_filter;
+ hx509_certs_find;
+ hx509_certs_free;
+ hx509_certs_info;
+ hx509_certs_init;
+ hx509_certs_iter;
+ hx509_certs_iter_f;
+ hx509_certs_merge;
+ hx509_certs_next_cert;
+ hx509_certs_start_seq;
+ hx509_certs_store;
+ hx509_ci_print_names;
+ hx509_clear_error_string;
+ hx509_cms_create_signed;
+ hx509_cms_create_signed_1;
+ hx509_cms_decrypt_encrypted;
+ hx509_cms_envelope_1;
+ hx509_cms_unenvelope;
+ hx509_cms_unwrap_ContentInfo;
+ hx509_cms_verify_signed;
+ hx509_cms_wrap_ContentInfo;
+ hx509_context_free;
+ hx509_context_init;
+ hx509_context_set_missing_revoke;
+ hx509_crl_add_revoked_certs;
+ hx509_crl_alloc;
+ hx509_crl_free;
+ hx509_crl_lifetime;
+ hx509_crl_sign;
+ hx509_crypto_aes128_cbc;
+ hx509_crypto_aes256_cbc;
+ hx509_crypto_allow_weak;
+ hx509_crypto_available;
+ hx509_crypto_decrypt;
+ hx509_crypto_des_rsdi_ede3_cbc;
+ hx509_crypto_destroy;
+ hx509_crypto_encrypt;
+ hx509_crypto_enctype_by_name;
+ hx509_crypto_free_algs;
+ hx509_crypto_get_params;
+ hx509_crypto_init;
+ hx509_crypto_provider;
+ hx509_crypto_select;
+ hx509_crypto_set_key_data;
+ hx509_crypto_set_key_name;
+ hx509_crypto_set_padding;
+ hx509_crypto_set_params;
+ hx509_crypto_set_random_key;
+ hx509_env_add;
+ hx509_env_add_binding;
+ hx509_env_find;
+ hx509_env_find_binding;
+ hx509_env_free;
+ hx509_env_init;
+ hx509_env_lfind;
+ hx509_err;
+ hx509_free_error_string;
+ hx509_free_octet_string_list;
+ hx509_general_name_unparse;
+ hx509_get_error_string;
+ hx509_get_one_cert;
+ hx509_lock_add_cert;
+ hx509_lock_add_certs;
+ hx509_lock_add_password;
+ hx509_lock_command_string;
+ hx509_lock_free;
+ hx509_lock_init;
+ hx509_lock_prompt;
+ hx509_lock_reset_certs;
+ hx509_lock_reset_passwords;
+ hx509_lock_reset_promper;
+ hx509_lock_set_prompter;
+ hx509_name_binary;
+ hx509_name_cmp;
+ hx509_name_copy;
+ hx509_name_expand;
+ hx509_name_free;
+ hx509_name_is_null_p;
+ hx509_name_normalize;
+ hx509_name_to_Name;
+ hx509_name_to_string;
+ hx509_ocsp_request;
+ hx509_ocsp_verify;
+ hx509_oid_print;
+ hx509_oid_sprint;
+ hx509_parse_name;
+ hx509_peer_info_add_cms_alg;
+ hx509_peer_info_alloc;
+ hx509_peer_info_free;
+ hx509_peer_info_set_cert;
+ hx509_peer_info_set_cms_algs;
+ hx509_pem_add_header;
+ hx509_pem_find_header;
+ hx509_pem_free_header;
+ hx509_pem_read;
+ hx509_pem_write;
+ hx509_print_stdout;
+ hx509_print_cert;
+ hx509_prompt_hidden;
+ hx509_query_alloc;
+ hx509_query_free;
+ hx509_query_match_cmp_func;
+ hx509_query_match_eku;
+ hx509_query_match_expr;
+ hx509_query_match_friendly_name;
+ hx509_query_match_issuer_serial;
+ hx509_query_match_option;
+ hx509_query_statistic_file;
+ hx509_query_unparse_stats;
+ hx509_revoke_add_crl;
+ hx509_revoke_add_ocsp;
+ hx509_revoke_free;
+ hx509_revoke_init;
+ hx509_revoke_ocsp_print;
+ hx509_revoke_verify;
+ hx509_set_error_string;
+ hx509_set_error_stringv;
+ hx509_signature_md5;
+ hx509_signature_rsa;
+ hx509_signature_rsa_with_md5;
+ hx509_signature_rsa_with_sha1;
+ hx509_signature_rsa_with_sha256;
+ hx509_signature_rsa_with_sha384;
+ hx509_signature_rsa_with_sha512;
+ hx509_signature_sha1;
+ hx509_signature_sha256;
+ hx509_signature_sha384;
+ hx509_signature_sha512;
+ hx509_unparse_der_name;
+ hx509_validate_cert;
+ hx509_validate_ctx_add_flags;
+ hx509_validate_ctx_free;
+ hx509_validate_ctx_init;
+ hx509_validate_ctx_set_print;
+ hx509_verify_attach_anchors;
+ hx509_verify_attach_revoke;
+ hx509_verify_ctx_f_allow_default_trustanchors;
+ hx509_verify_destroy_ctx;
+ hx509_verify_hostname;
+ hx509_verify_init_ctx;
+ hx509_verify_path;
+ hx509_verify_set_max_depth;
+ hx509_verify_set_proxy_certificate;
+ hx509_verify_set_strict_rfc3280_verification;
+ hx509_verify_set_time;
+ hx509_verify_signature;
+ hx509_xfree;
+ initialize_hx_error_table_r;
+ # pkcs11 symbols
+ C_GetFunctionList;
+ local:
+ *;
+};
+
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index d6cbaa1..e97867c 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -202,8 +202,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
name=name)
-def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
- version_script=None):
+def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cflags=''):
'''define a Heimdal library'''
obj_target = libname + '.objlist'
@@ -236,18 +235,6 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
bundled_name = libname
version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
- if version_script:
- version_script = heimdal_path(version_script)
- elif bld.env.HAVE_LD_VERSION_SCRIPT:
- version_script = "%s.vscript" % libname
- namespace = version.replace("-","_").replace("+","_").upper(),
- HEIMDAL_GENERATOR(version_script,
- rule="echo %s \{ global: \*\; \}\; > ${TGT}" % namespace,
- group='vscripts',
- target=version_script)
- deps.append(version_script)
- version_script = os.path.join(bld.path.abspath(bld.env), version_script)
-
features = 'cc cshlib symlink_lib install_lib'
bld.set_group('libraries')
@@ -263,7 +250,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, includes='', cflags='',
ldflags = ldflags,
vars = [version],
private_library = bundled_build,
- version_script = version_script,
+ version_script = heimdal_path(version_script),
)
@@ -368,32 +355,12 @@ HEIMDAL_ASN1('HEIMDAL_GSSAPI_ASN1',
)
-HEIMDAL_ASN1('HEIMDAL_KRB5_ASN1',
- 'lib/asn1/krb5.asn1',
- option_file='lib/asn1/krb5.opt',
- directory='lib/asn1'
- )
-
-
HEIMDAL_ASN1('HEIMDAL_DIGEST_ASN1',
'lib/asn1/digest.asn1',
directory='lib/asn1'
)
-HEIMDAL_ASN1('HEIMDAL_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',
- 'lib/asn1/pkinit.asn1',
- directory='lib/asn1'
- )
-
-
HEIMDAL_ASN1('HEIMDAL_KX509_ASN1',
'lib/asn1/kx509.asn1',
directory='lib/asn1'
@@ -516,7 +483,7 @@ KDC_SOURCE='kdc/default_config.c kdc/kerberos5.c kdc/krb5tgs.c kdc/pkinit.c kdc/
HEIMDAL_LIBRARY('kdc', source=KDC_SOURCE,
includes='../heimdal/kdc',
- deps='roken krb5 hdb asn1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm HEIMDAL_HCRYPTO com_err wind HEIMDAL_BASE',
+ deps='roken krb5 hdb asn1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 heimntlm hcrypto com_err wind hbase',
vnum='2.0.0',
version_script='kdc/version-script.map')
HEIMDAL_AUTOPROTO('kdc/kdc-protos.h', KDC_SOURCE)
@@ -529,7 +496,7 @@ HEIMNTLM_SOURCE = 'lib/ntlm/ntlm.c'
HEIMDAL_LIBRARY('heimntlm',
source=HEIMNTLM_SOURCE,
includes='../heimdal/lib/ntlm',
- deps='roken HEIMDAL_HCRYPTO krb5',
+ deps='roken hcrypto krb5',
vnum='1.0.1',
version_script='lib/ntlm/version-script.map',
)
@@ -539,7 +506,7 @@ HEIMDAL_AUTOPROTO('lib/ntlm/heimntlm-protos.h', HEIMNTLM_SOURCE)
HEIMDAL_SUBSYSTEM('HEIMDAL_HDB_KEYS',
'lib/hdb/keys.c',
includes='../heimdal/lib/hdb',
- deps='roken HEIMDAL_HCRYPTO krb5 HEIMDAL_HDB_ASN1'
+ deps='roken hcrypto krb5 HEIMDAL_HDB_ASN1'
)
@@ -552,7 +519,7 @@ HEIMDAL_LIBRARY('hdb',
version_script='lib/hdb/version-script.map',
source=HDB_SOURCE,
includes='../heimdal/lib/hdb',
- deps='krb5 HEIMDAL_HDB_KEYS roken HEIMDAL_HCRYPTO com_err HEIMDAL_HDB_ASN1 wind',
+ 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)
@@ -602,7 +569,7 @@ lib/gssapi/mech/gss_import_name.c lib/gssapi/mech/gss_duplicate_name.c lib/gssap
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',
--
Samba Shared Repository
More information about the samba-cvs
mailing list