[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha5-201-g3817d65
Stefan Metzmacher
metze at samba.org
Fri Aug 1 14:15:19 GMT 2008
The branch, v4-0-test has been updated
via 3817d653faecb70bfafb850fe7d6e83aaed7e6d1 (commit)
via d6c54a66fb23c784ef221a3c1cf766b72bdb5a0b (commit)
via 8bd30a7b4392642ef5184f959d801716d2db20b2 (commit)
from c01fee80a79cd9e0f7bb295333bb03bd37328d05 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 3817d653faecb70bfafb850fe7d6e83aaed7e6d1
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 1 11:17:48 2008 +0200
build with the new heimdal version
commit d6c54a66fb23c784ef221a3c1cf766b72bdb5a0b
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 1 07:08:51 2008 +0200
heimdal: update to lorikeet-heimdal rev 801
metze
commit 8bd30a7b4392642ef5184f959d801716d2db20b2
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Aug 1 11:16:14 2008 +0200
build: allow flex-2.34 together with bison-2.3
metze
-----------------------------------------------------------------------
Summary of changes:
source/auth/kerberos/krb5_init_context.c | 3 +-
source/auth/kerberos/krb5_init_context.h | 1 +
source/build/make/lex_compile.sh | 13 +-
source/build/make/yacc_compile.sh | 4 +-
source/heimdal/README | 23 +-
source/heimdal/cf/check-var.m4 | 3 +-
source/heimdal/cf/find-func-no-libs.m4 | 2 +-
source/heimdal/cf/find-func-no-libs2.m4 | 2 +-
source/heimdal/cf/find-func.m4 | 2 +-
source/heimdal/cf/resolv.m4 | 2 +-
source/heimdal/kdc/default_config.c | 4 +-
source/heimdal/kdc/digest.c | 200 ++-
source/heimdal/kdc/kaserver.c | 8 +-
source/heimdal/kdc/kerberos5.c | 14 +-
source/heimdal/kdc/krb5tgs.c | 639 ++++---
source/heimdal/kdc/kx509.c | 36 +-
source/heimdal/kdc/misc.c | 11 +-
source/heimdal/kdc/pkinit.c | 146 +-
source/heimdal/kdc/process.c | 9 +-
source/heimdal/kdc/windc.c | 6 +-
source/heimdal/kdc/windc_plugin.h | 4 +-
source/heimdal/kuser/kinit.c | 61 +-
source/heimdal/lib/asn1/der.h | 2 +-
source/heimdal/lib/asn1/der_free.c | 2 +-
source/heimdal/lib/asn1/gen.c | 17 +-
source/heimdal/lib/asn1/k5.asn1 | 24 +-
source/heimdal/lib/asn1/lex.c | 73 +-
source/heimdal/lib/asn1/lex.l | 2 +-
source/heimdal/lib/asn1/pkinit.asn1 | 13 +
source/heimdal/lib/asn1/test.gen | 2 +-
source/heimdal/lib/com_err/lex.c | 73 +-
source/heimdal/lib/com_err/lex.l | 2 +-
source/heimdal/lib/gssapi/gssapi/gssapi.h | 137 +-
source/heimdal/lib/gssapi/gssapi/gssapi_krb5.h | 95 +-
source/heimdal/lib/gssapi/gssapi/gssapi_spnego.h | 4 +-
.../heimdal/lib/gssapi/krb5/accept_sec_context.c | 75 +-
.../heimdal/lib/gssapi/krb5/delete_sec_context.c | 4 +-
source/heimdal/lib/gssapi/krb5/display_status.c | 4 +-
source/heimdal/lib/gssapi/krb5/external.c | 177 ++-
source/heimdal/lib/gssapi/krb5/get_mic.c | 6 +-
source/heimdal/lib/gssapi/krb5/gsskrb5_locl.h | 11 +-
.../heimdal/lib/gssapi/krb5/import_sec_context.c | 8 +-
source/heimdal/lib/gssapi/krb5/init_sec_context.c | 272 ++-
source/heimdal/lib/gssapi/krb5/set_cred_option.c | 2 +-
.../lib/gssapi/krb5/set_sec_context_option.c | 61 +-
source/heimdal/lib/gssapi/krb5/unwrap.c | 8 +-
source/heimdal/lib/gssapi/krb5/verify_mic.c | 6 +-
source/heimdal/lib/gssapi/krb5/wrap.c | 14 +-
source/heimdal/lib/gssapi/mech/gss_acquire_cred.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_add_cred.c | 4 +-
.../lib/gssapi/mech/gss_add_oid_set_member.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_buffer_set.c | 8 +-
.../lib/gssapi/mech/gss_canonicalize_name.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_compare_name.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_context_time.c | 4 +-
.../lib/gssapi/mech/gss_create_empty_oid_set.c | 4 +-
.../lib/gssapi/mech/gss_decapsulate_token.c | 4 +-
.../lib/gssapi/mech/gss_delete_sec_context.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_display_name.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_display_status.c | 4 +-
.../lib/gssapi/mech/gss_encapsulate_token.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_export_name.c | 4 +-
.../lib/gssapi/mech/gss_export_sec_context.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_get_mic.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_import_name.c | 4 +-
.../lib/gssapi/mech/gss_import_sec_context.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_indicate_mechs.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_init_sec_context.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_inquire_context.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_inquire_cred.c | 4 +-
.../lib/gssapi/mech/gss_inquire_cred_by_mech.c | 4 +-
.../lib/gssapi/mech/gss_inquire_cred_by_oid.c | 4 +-
.../lib/gssapi/mech/gss_inquire_mechs_for_name.c | 4 +-
.../lib/gssapi/mech/gss_inquire_names_for_mech.c | 4 +-
.../gssapi/mech/gss_inquire_sec_context_by_oid.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_krb5.c | 91 +-
source/heimdal/lib/gssapi/mech/gss_mech_switch.c | 7 +-
source/heimdal/lib/gssapi/mech/gss_oid_equal.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_oid_to_str.c | 4 +-
.../lib/gssapi/mech/gss_process_context_token.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_release_buffer.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_release_cred.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_release_name.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_release_oid.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_release_oid_set.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_seal.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_set_cred_option.c | 4 +-
.../lib/gssapi/mech/gss_set_sec_context_option.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_sign.c | 4 +-
.../lib/gssapi/mech/gss_test_oid_set_member.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_unseal.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_unwrap.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_verify.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_verify_mic.c | 4 +-
source/heimdal/lib/gssapi/mech/gss_wrap.c | 4 +-
.../heimdal/lib/gssapi/mech/gss_wrap_size_limit.c | 4 +-
.../heimdal/lib/gssapi/spnego/accept_sec_context.c | 98 +-
source/heimdal/lib/gssapi/spnego/compat.c | 5 +-
source/heimdal/lib/gssapi/spnego/context_stubs.c | 32 +-
source/heimdal/lib/gssapi/spnego/cred_stubs.c | 22 +-
source/heimdal/lib/gssapi/spnego/external.c | 13 +-
source/heimdal/lib/gssapi/spnego/spnego-private.h | 16 +
source/heimdal/lib/gssapi/spnego/spnego_locl.h | 3 +-
source/heimdal/lib/hcrypto/aes.h | 10 +-
source/heimdal/lib/hcrypto/bn.c | 6 +-
source/heimdal/lib/hcrypto/camellia-ntt.c | 22 +-
source/heimdal/lib/hcrypto/camellia-ntt.h | 6 +-
source/heimdal/lib/hcrypto/camellia.h | 8 +-
source/heimdal/lib/hcrypto/des.c | 302 +++-
source/heimdal/lib/hcrypto/des.h | 78 +-
source/heimdal/lib/hcrypto/evp.c | 31 +-
source/heimdal/lib/hcrypto/evp.h | 26 +-
source/heimdal/lib/hcrypto/imath/LICENSE | 2 +-
source/heimdal/lib/hcrypto/pkcs12.c | 24 +-
source/heimdal/lib/hcrypto/pkcs5.c | 18 +-
source/heimdal/lib/hcrypto/rand-egd.c | 4 +-
source/heimdal/lib/hcrypto/rand-fortuna.c | 15 +-
source/heimdal/lib/hcrypto/rand-unix.c | 6 +-
source/heimdal/lib/hcrypto/rand.c | 166 ++-
source/heimdal/lib/hcrypto/rnd_keys.c | 471 +-----
source/heimdal/lib/hcrypto/ui.c | 8 +-
source/heimdal/lib/hdb/db.c | 40 +-
source/heimdal/lib/hdb/dbinfo.c | 4 +-
source/heimdal/lib/hdb/ext.c | 45 +-
source/heimdal/lib/hdb/hdb.c | 7 +-
source/heimdal/lib/hdb/keys.c | 13 +-
source/heimdal/lib/hdb/keytab.c | 10 +-
source/heimdal/lib/hdb/mkey.c | 33 +-
source/heimdal/lib/hdb/ndbm.c | 38 +-
source/heimdal/lib/hx509/ca.c | 4 +-
source/heimdal/lib/hx509/cert.c | 162 ++-
source/heimdal/lib/hx509/cms.c | 16 +-
source/heimdal/lib/hx509/crypto.c | 14 +-
source/heimdal/lib/hx509/env.c | 181 ++-
source/heimdal/lib/hx509/file.c | 81 +-
source/heimdal/lib/hx509/hx509-private.h | 43 +-
source/heimdal/lib/hx509/hx509-protos.h | 42 +-
source/heimdal/lib/hx509/hx509.h | 13 +-
source/heimdal/lib/hx509/hx_locl.h | 22 +-
source/heimdal/lib/hx509/keyset.c | 16 +-
source/heimdal/lib/hx509/ks_dir.c | 3 +-
source/heimdal/lib/hx509/ks_file.c | 8 +-
source/heimdal/lib/hx509/ks_p11.c | 31 +-
source/heimdal/lib/hx509/ks_p12.c | 7 +-
source/heimdal/lib/hx509/name.c | 4 +-
source/heimdal/lib/hx509/req.c | 6 +-
source/heimdal/lib/hx509/revoke.c | 38 +-
source/heimdal/lib/hx509/sel-gram.c | 1714 ++++++++++++++++++
source/heimdal/lib/hx509/sel-gram.h | 83 +
source/heimdal/lib/hx509/sel-gram.y | 115 ++
source/heimdal/lib/hx509/sel-lex.c | 1899 ++++++++++++++++++++
source/heimdal/lib/hx509/sel-lex.l | 135 ++
source/heimdal/lib/hx509/sel.c | 232 +++
source/heimdal/lib/hx509/sel.h | 82 +
source/heimdal/lib/hx509/test_name.c | 7 +-
source/heimdal/lib/krb5/acache.c | 71 +-
source/heimdal/lib/krb5/addr_families.c | 75 +-
source/heimdal/lib/krb5/auth_context.c | 18 +-
source/heimdal/lib/krb5/build_auth.c | 10 +-
source/heimdal/lib/krb5/cache.c | 256 +++-
source/heimdal/lib/krb5/changepw.c | 97 +-
source/heimdal/lib/krb5/config_file.c | 10 +-
source/heimdal/lib/krb5/constants.c | 6 +-
source/heimdal/lib/krb5/context.c | 78 +-
source/heimdal/lib/krb5/convert_creds.c | 8 +-
source/heimdal/lib/krb5/copy_host_realm.c | 17 +-
source/heimdal/lib/krb5/crc.c | 4 +-
source/heimdal/lib/krb5/creds.c | 8 +-
source/heimdal/lib/krb5/crypto.c | 584 ++++---
source/heimdal/lib/krb5/data.c | 4 +-
source/heimdal/lib/krb5/error_string.c | 146 ++-
source/heimdal/lib/krb5/expand_hostname.c | 7 +-
source/heimdal/lib/krb5/fcache.c | 204 ++-
source/heimdal/lib/krb5/generate_subkey.c | 4 +-
source/heimdal/lib/krb5/get_cred.c | 588 ++++---
source/heimdal/lib/krb5/get_default_principal.c | 6 +-
source/heimdal/lib/krb5/get_default_realm.c | 4 +-
source/heimdal/lib/krb5/get_for_creds.c | 21 +-
source/heimdal/lib/krb5/get_host_realm.c | 16 +-
source/heimdal/lib/krb5/get_in_tkt.c | 377 ++++-
source/heimdal/lib/krb5/init_creds.c | 14 +-
source/heimdal/lib/krb5/init_creds_pw.c | 110 +-
source/heimdal/lib/krb5/kcm.c | 56 +-
source/heimdal/lib/krb5/keyblock.c | 15 +-
source/heimdal/lib/krb5/keytab.c | 57 +-
source/heimdal/lib/krb5/keytab_any.c | 17 +-
source/heimdal/lib/krb5/keytab_file.c | 54 +-
source/heimdal/lib/krb5/keytab_keyfile.c | 54 +-
source/heimdal/lib/krb5/keytab_memory.c | 8 +-
source/heimdal/lib/krb5/krb5-private.h | 32 +-
source/heimdal/lib/krb5/krb5-protos.h | 83 +-
source/heimdal/lib/krb5/krb5.h | 50 +-
source/heimdal/lib/krb5/krb5_err.et | 6 +-
source/heimdal/lib/krb5/krb5_locl.h | 30 +-
source/heimdal/lib/krb5/krbhst.c | 22 +-
source/heimdal/lib/krb5/locate_plugin.h | 4 +-
source/heimdal/lib/krb5/log.c | 24 +-
source/heimdal/lib/krb5/mcache.c | 15 +-
source/heimdal/lib/krb5/mk_priv.c | 4 +-
source/heimdal/lib/krb5/mk_rep.c | 12 +-
source/heimdal/lib/krb5/n-fold.c | 2 +-
source/heimdal/lib/krb5/pac.c | 113 +-
source/heimdal/lib/krb5/padata.c | 4 +-
source/heimdal/lib/krb5/pkinit.c | 415 +++---
source/heimdal/lib/krb5/plugin.c | 19 +-
source/heimdal/lib/krb5/principal.c | 114 +-
source/heimdal/lib/krb5/rd_cred.c | 9 +-
source/heimdal/lib/krb5/rd_error.c | 36 +-
source/heimdal/lib/krb5/rd_rep.c | 4 +-
source/heimdal/lib/krb5/rd_req.c | 21 +-
source/heimdal/lib/krb5/replay.c | 31 +-
source/heimdal/lib/krb5/send_to_kdc.c | 62 +-
source/heimdal/lib/krb5/send_to_kdc_plugin.h | 58 +
source/heimdal/lib/krb5/set_default_realm.c | 6 +-
source/heimdal/lib/krb5/ticket.c | 36 +-
source/heimdal/lib/krb5/time.c | 31 +-
source/heimdal/lib/krb5/transited.c | 42 +-
source/heimdal/lib/krb5/v4_glue.c | 71 +-
source/heimdal/lib/krb5/warn.c | 8 +-
source/heimdal/lib/ntlm/ntlm.c | 6 +-
source/heimdal/lib/roken/dumpdata.c | 44 +-
source/heimdal/lib/roken/err.hin | 2 +-
source/heimdal/lib/roken/resolve.c | 5 +-
source/heimdal/lib/roken/roken-common.h | 15 +-
source/heimdal/lib/roken/roken.h.in | 2 +-
source/heimdal/lib/roken/vis.hin | 2 +-
source/heimdal/lib/wind/stringprep.c | 4 +-
source/heimdal/lib/wind/utf8.c | 179 ++-
source/heimdal/lib/wind/wind.h | 13 +-
source/heimdal/lib/wind/wind_err.et | 3 +-
source/heimdal/lib/wind/windlocl.h | 4 +-
source/heimdal_build/internal.m4 | 1 +
source/heimdal_build/internal.mk | 10 +-
233 files changed, 10203 insertions(+), 3568 deletions(-)
mode change 100755 => 100644 source/heimdal/lib/hcrypto/aes.c
mode change 100755 => 100644 source/heimdal/lib/hcrypto/aes.h
mode change 100755 => 100644 source/heimdal/lib/hcrypto/rc2.c
mode change 100755 => 100644 source/heimdal/lib/hcrypto/rc2.h
mode change 100755 => 100644 source/heimdal/lib/hcrypto/rc4.c
mode change 100755 => 100644 source/heimdal/lib/hcrypto/rijndael-alg-fst.c
mode change 100755 => 100644 source/heimdal/lib/hcrypto/rijndael-alg-fst.h
create mode 100644 source/heimdal/lib/hx509/sel-gram.c
create mode 100644 source/heimdal/lib/hx509/sel-gram.h
create mode 100644 source/heimdal/lib/hx509/sel-gram.y
create mode 100644 source/heimdal/lib/hx509/sel-lex.c
create mode 100644 source/heimdal/lib/hx509/sel-lex.l
create mode 100644 source/heimdal/lib/hx509/sel.c
create mode 100644 source/heimdal/lib/hx509/sel.h
create mode 100644 source/heimdal/lib/krb5/send_to_kdc_plugin.h
Changeset truncated at 500 lines:
diff --git a/source/auth/kerberos/krb5_init_context.c b/source/auth/kerberos/krb5_init_context.c
index a455fda..02d8cd0 100644
--- a/source/auth/kerberos/krb5_init_context.c
+++ b/source/auth/kerberos/krb5_init_context.c
@@ -208,6 +208,7 @@ static void smb_krb5_socket_handler(struct event_context *ev, struct fd_event *f
krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
void *data,
krb5_krbhst_info *hi,
+ time_t timeout,
const krb5_data *send_buf,
krb5_data *recv_buf)
{
@@ -298,7 +299,7 @@ krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
socket_set_flags(smb_krb5->sock, SOCKET_FLAG_NOCLOSE);
event_add_timed(ev, smb_krb5,
- timeval_current_ofs(context->kdc_timeout, 0),
+ timeval_current_ofs(timeout, 0),
smb_krb5_request_timeout, smb_krb5);
diff --git a/source/auth/kerberos/krb5_init_context.h b/source/auth/kerberos/krb5_init_context.h
index 44771f2..815e9a6 100644
--- a/source/auth/kerberos/krb5_init_context.h
+++ b/source/auth/kerberos/krb5_init_context.h
@@ -32,5 +32,6 @@ void smb_krb5_free_context(struct smb_krb5_context *smb_krb5_context);
krb5_error_code smb_krb5_send_and_recv_func(krb5_context context,
void *data,
krb5_krbhst_info *hi,
+ time_t timeout,
const krb5_data *send_buf,
krb5_data *recv_buf);
diff --git a/source/build/make/lex_compile.sh b/source/build/make/lex_compile.sh
index 9bba725..d05056d 100755
--- a/source/build/make/lex_compile.sh
+++ b/source/build/make/lex_compile.sh
@@ -31,20 +31,29 @@ if [ -r $DEST ]; then
fi
fi
TOP=`pwd`
+echo "info: running $LEX $ARGS $file"
if cd $dir && $LEX $ARGS $file; then
- if [ -r $base.yy.c ];then
+ if [ -r lex.yy.c ];then
# we must guarantee that config.h comes first
+ echo "info: move lex.yy.c to $base.c"
+ echo "#include \"config.h\"" > $base.c
+ sed -e "s|lex\.yy\.c|$DEST|" lex.yy.c >> $base.c
+ rm -f $base.yy.c
+ elif [ -r $base.yy.c ];then
+ # we must guarantee that config.h comes first
+ echo "info: move $base.yy.c to $base.c"
echo "#include \"config.h\"" > $base.c
sed -e "s|$base\.yy\.c|$DEST|" $base.yy.c >> $base.c
rm -f $base.yy.c
elif [ -r $base.c ];then
# we must guarantee that config.h comes first
+ echo "info: add #include \"config.h\" to $base.c"
mv $base.c $base.c.tmp
echo "#include \"config.h\"" > $base.c
sed -e "s|$base\.yy\.c|$DEST|" $base.c.tmp >> $base.c
rm -f $base.c.tmp
elif [ ! -r base.c ]; then
- echo "$base.c nor $base.yy.c generated."
+ echo "$base.c nor $base.yy.c nor lex.yy.c generated."
exit 1
fi
fi
diff --git a/source/build/make/yacc_compile.sh b/source/build/make/yacc_compile.sh
index a56a51d..ac4afea 100755
--- a/source/build/make/yacc_compile.sh
+++ b/source/build/make/yacc_compile.sh
@@ -29,10 +29,12 @@ if [ -r $DEST ]; then
fi
fi
TOP=`pwd`
+echo "info: running $YACC -d $file"
if cd $dir && $YACC -d $file; then
if [ -r y.tab.h -a -r y.tab.c ];then
- #echo "info: move files"
+ echo "info: move y.tab.h to $base.h"
sed -e "/^#/!b" -e "s|y\.tab\.h|$SRC|" -e "s|\"$base.y|\"$SRC|" y.tab.h > $base.h
+ echo "info: move y.tab.c to $base.c"
sed -e "s|y\.tab\.c|$SRC|" -e "s|\"$base.y|\"$SRC|" y.tab.c > $base.c
rm -f y.tab.c y.tab.h
elif [ ! -r $base.h -a ! -r $base.c]; then
diff --git a/source/heimdal/README b/source/heimdal/README
index 131cc57..88ab7fd 100644
--- a/source/heimdal/README
+++ b/source/heimdal/README
@@ -1,6 +1,19 @@
-This directory contains a copy of portions of a project known as
-'lorikeet-heimdal', a branch of the Heimdal Kerberos distribution.
+$Id: README 8839 2000-07-27 02:33:54Z assar $
-The purpose of these files is to provide kerberos support to Samba4 in
-a predicatable manner, without reliance on the system kerberos
-libraries.
+Heimdal is a Kerberos 5 implementation.
+
+Please see the manual in doc, by default installed in
+/usr/heimdal/info/heimdal.info for information on how to install.
+There are also briefer man pages for most of the commands.
+
+Bug reports and bugs are appreciated, see more under Bug reports in
+the manual on how we prefer them.
+
+For more information see the web-page at
+<http://www.pdc.kth.se/heimdal/> or the mailing lists:
+
+heimdal-announce at sics.se low-volume announcement
+heimdal-discuss at sics.se high-volume discussion
+
+send a mail to heimdal-announce-request at sics.se and
+heimdal-discuss-request at sics.se respectively to subscribe.
diff --git a/source/heimdal/cf/check-var.m4 b/source/heimdal/cf/check-var.m4
index 1f06b47..ffa6191 100644
--- a/source/heimdal/cf/check-var.m4
+++ b/source/heimdal/cf/check-var.m4
@@ -1,4 +1,4 @@
-dnl $Id: check-var.m4,v 1.12 2005/06/16 18:59:10 lha Exp $
+dnl $Id: check-var.m4 15422 2005-06-16 18:59:29Z lha $
dnl
dnl rk_CHECK_VAR(variable, includes)
AC_DEFUN([rk_CHECK_VAR], [
@@ -23,4 +23,5 @@ if test "$ac_foo" = yes; then
fi
])
+dnl AC_WARNING_ENABLE([obsolete])
AU_DEFUN([AC_CHECK_VAR], [rk_CHECK_VAR([$2], [$1])], [foo])
diff --git a/source/heimdal/cf/find-func-no-libs.m4 b/source/heimdal/cf/find-func-no-libs.m4
index 03ff6dc..76965a8 100644
--- a/source/heimdal/cf/find-func-no-libs.m4
+++ b/source/heimdal/cf/find-func-no-libs.m4
@@ -1,4 +1,4 @@
-dnl $Id: find-func-no-libs.m4,v 1.6 2004/02/12 14:20:45 lha Exp $
+dnl $Id: find-func-no-libs.m4 13338 2004-02-12 14:21:14Z lha $
dnl
dnl
dnl Look for function in any of the specified libraries
diff --git a/source/heimdal/cf/find-func-no-libs2.m4 b/source/heimdal/cf/find-func-no-libs2.m4
index 2e7c8b7..617a09e 100644
--- a/source/heimdal/cf/find-func-no-libs2.m4
+++ b/source/heimdal/cf/find-func-no-libs2.m4
@@ -1,4 +1,4 @@
-dnl $Id: find-func-no-libs2.m4,v 1.9 2004/08/26 12:35:42 joda Exp $
+dnl $Id: find-func-no-libs2.m4 14166 2004-08-26 12:35:42Z joda $
dnl
dnl
dnl Look for function in any of the specified libraries
diff --git a/source/heimdal/cf/find-func.m4 b/source/heimdal/cf/find-func.m4
index aa50028..2354f38 100644
--- a/source/heimdal/cf/find-func.m4
+++ b/source/heimdal/cf/find-func.m4
@@ -1,4 +1,4 @@
-dnl $Id: find-func.m4,v 1.2 2004/02/12 14:20:47 lha Exp $
+dnl $Id: find-func.m4 13338 2004-02-12 14:21:14Z lha $
dnl
dnl AC_FIND_FUNC(func, libraries, includes, arguments)
AC_DEFUN([AC_FIND_FUNC], [
diff --git a/source/heimdal/cf/resolv.m4 b/source/heimdal/cf/resolv.m4
index 20e85a8..8bb5e4e 100644
--- a/source/heimdal/cf/resolv.m4
+++ b/source/heimdal/cf/resolv.m4
@@ -1,6 +1,6 @@
dnl stuff used by DNS resolv code in roken
dnl
-dnl $Id: resolv.m4,v 1.1 2005/09/02 10:17:38 lha Exp $
+dnl $Id: resolv.m4 16009 2005-09-02 10:17:38Z lha $
dnl
AC_DEFUN([rk_RESOLV],[
diff --git a/source/heimdal/kdc/default_config.c b/source/heimdal/kdc/default_config.c
index 5f336e3..33a2c29 100644
--- a/source/heimdal/kdc/default_config.c
+++ b/source/heimdal/kdc/default_config.c
@@ -36,7 +36,7 @@
#include <getarg.h>
#include <parse_bytes.h>
-RCSID("$Id: default_config.c 21405 2007-07-04 10:35:45Z lha $");
+RCSID("$Id: default_config.c 23316 2008-06-23 04:32:32Z lha $");
krb5_error_code
krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
@@ -45,7 +45,7 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
c = calloc(1, sizeof(*c));
if (c == NULL) {
- krb5_set_error_string(context, "malloc: out of memory");
+ krb5_set_error_message(context, ENOMEM, "malloc: out of memory");
return ENOMEM;
}
diff --git a/source/heimdal/kdc/digest.c b/source/heimdal/kdc/digest.c
index b845b0f..bf1e45b 100644
--- a/source/heimdal/kdc/digest.c
+++ b/source/heimdal/kdc/digest.c
@@ -34,7 +34,7 @@
#include "kdc_locl.h"
#include <hex.h>
-RCSID("$Id: digest.c 22374 2007-12-28 18:36:52Z lha $");
+RCSID("$Id: digest.c 23316 2008-06-23 04:32:32Z lha $");
#define MS_CHAP_V2 0x20
#define CHAP_MD5 0x10
@@ -44,13 +44,13 @@ RCSID("$Id: digest.c 22374 2007-12-28 18:36:52Z lha $");
#define NTLM_V1 0x01
const struct units _kdc_digestunits[] = {
- {"ms-chap-v2", 1U << 5},
- {"chap-md5", 1U << 4},
- {"digest-md5", 1U << 3},
- {"ntlm-v2", 1U << 2},
- {"ntlm-v1-session", 1U << 1},
- {"ntlm-v1", 1U << 0},
- {NULL, 0}
+ {"ms-chap-v2", 1U << 5},
+ {"chap-md5", 1U << 4},
+ {"digest-md5", 1U << 3},
+ {"ntlm-v2", 1U << 2},
+ {"ntlm-v1-session", 1U << 1},
+ {"ntlm-v1", 1U << 0},
+ {NULL, 0}
};
@@ -121,10 +121,10 @@ fill_targetinfo(krb5_context context,
strcmp("imap", str) == 0 ||
strcmp("pop", str) == 0 ||
strcmp("smtp", str)))
- {
- str = krb5_principal_get_comp_string(context, p, 1);
- ti.dnsservername = rk_UNCONST(str);
- }
+ {
+ str = krb5_principal_get_comp_string(context, p, 1);
+ ti.dnsservername = rk_UNCONST(str);
+ }
ret = heim_ntlm_encode_targetinfo(&ti, 1, &d);
if (ret)
@@ -186,7 +186,7 @@ get_password_entry(krb5_context context,
if (ret || password == NULL) {
if (ret == 0) {
ret = EINVAL;
- krb5_set_error_string(context, "password missing");
+ krb5_set_error_message(context, ret, "password missing");
}
memset(user, 0, sizeof(*user));
}
@@ -263,7 +263,7 @@ _kdc_do_digest(krb5_context context,
goto out;
ret = EINVAL;
- krb5_set_error_string(context, "Wrong digest server principal used");
+ krb5_set_error_message(context, ret, "Wrong digest server principal used");
p = krb5_principal_get_comp_string(context, principal, 0);
if (p == NULL) {
krb5_free_principal(context, principal);
@@ -323,9 +323,9 @@ _kdc_do_digest(krb5_context context,
"Client %s tried to use digest "
"but is not allowed to",
client_name);
- krb5_set_error_string(context,
- "Client is not permitted to use digest");
ret = KRB5KDC_ERR_POLICY;
+ krb5_set_error_message(context, ret,
+ "Client is not permitted to use digest");
goto out;
}
}
@@ -338,8 +338,8 @@ _kdc_do_digest(krb5_context context,
if (ret)
goto out;
if (key == NULL) {
- krb5_set_error_string(context, "digest: remote subkey not found");
ret = EINVAL;
+ krb5_set_error_message(context, ret, "digest: remote subkey not found");
goto out;
}
@@ -359,7 +359,7 @@ _kdc_do_digest(krb5_context context,
ret = decode_DigestReqInner(buf.data, buf.length, &ireq, NULL);
krb5_data_free(&buf);
if (ret) {
- krb5_set_error_string(context, "Failed to decode digest inner request");
+ krb5_set_error_message(context, ret, "Failed to decode digest inner request");
goto out;
}
@@ -386,15 +386,15 @@ _kdc_do_digest(krb5_context context,
hex_encode(server_nonce, sizeof(server_nonce), &r.u.initReply.nonce);
if (r.u.initReply.nonce == NULL) {
- krb5_set_error_string(context, "Failed to decode server nonce");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "Failed to decode server nonce");
goto out;
}
sp = krb5_storage_emem();
if (sp == NULL) {
ret = ENOMEM;
- krb5_set_error_string(context, "out of memory");
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
ret = krb5_store_stringz(sp, ireq.u.init.type);
@@ -410,9 +410,9 @@ _kdc_do_digest(krb5_context context,
ireq.u.init.channel->cb_type,
ireq.u.init.channel->cb_binding);
if (s == NULL) {
- krb5_set_error_string(context, "Failed to allocate "
- "channel binding");
ret = ENOMEM;
+ krb5_set_error_message(context, ret,
+ "Failed to allocate channel binding");
goto out;
}
free(r.u.initReply.nonce);
@@ -429,15 +429,15 @@ _kdc_do_digest(krb5_context context,
r.u.initReply.identifier =
malloc(sizeof(*r.u.initReply.identifier));
if (r.u.initReply.identifier == NULL) {
- krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
asprintf(r.u.initReply.identifier, "%02X", identifier & 0xff);
if (*r.u.initReply.identifier == NULL) {
- krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
@@ -478,8 +478,8 @@ _kdc_do_digest(krb5_context context,
ASN1_MALLOC_ENCODE(Checksum, buf.data, buf.length, &res, &size, ret);
free_Checksum(&res);
if (ret) {
- krb5_set_error_string(context, "Failed to encode "
- "checksum in digest request");
+ krb5_set_error_message(context, ret, "Failed to encode "
+ "checksum in digest request");
goto out;
}
if (size != buf.length)
@@ -502,7 +502,7 @@ _kdc_do_digest(krb5_context context,
sp = krb5_storage_emem();
if (sp == NULL) {
ret = ENOMEM;
- krb5_set_error_string(context, "out of memory");
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
ret = krb5_store_stringz(sp, ireq.u.digestRequest.type);
@@ -524,15 +524,15 @@ _kdc_do_digest(krb5_context context,
buf.length = strlen(ireq.u.digestRequest.opaque);
buf.data = malloc(buf.length);
if (buf.data == NULL) {
- krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
ret = hex_decode(ireq.u.digestRequest.opaque, buf.data, buf.length);
if (ret <= 0) {
- krb5_set_error_string(context, "Failed to decode opaque");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "Failed to decode opaque");
goto out;
}
buf.length = ret;
@@ -540,7 +540,7 @@ _kdc_do_digest(krb5_context context,
ret = decode_Checksum(buf.data, buf.length, &res, NULL);
free(buf.data);
if (ret) {
- krb5_set_error_string(context, "Failed to decode digest Checksum");
+ krb5_set_error_message(context, ret, "Failed to decode digest Checksum");
goto out;
}
@@ -553,8 +553,8 @@ _kdc_do_digest(krb5_context context,
serverNonce.length = strlen(ireq.u.digestRequest.serverNonce);
serverNonce.data = malloc(serverNonce.length);
if (serverNonce.data == NULL) {
- krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
@@ -568,8 +568,8 @@ _kdc_do_digest(krb5_context context,
ssize = hex_decode(ireq.u.digestRequest.serverNonce,
serverNonce.data, serverNonce.length);
if (ssize <= 0) {
- krb5_set_error_string(context, "Failed to decode serverNonce");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "Failed to decode serverNonce");
goto out;
}
serverNonce.length = ssize;
@@ -593,15 +593,15 @@ _kdc_do_digest(krb5_context context,
uint32_t t;
if (serverNonce.length < 4) {
- krb5_set_error_string(context, "server nonce too short");
ret = EINVAL;
+ krb5_set_error_message(context, ret, "server nonce too short");
goto out;
}
t = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
if (abs((kdc_time & 0xffffffff) - t) > context->max_skew) {
- krb5_set_error_string(context, "time screw in server nonce ");
ret = EINVAL;
+ krb5_set_error_message(context, ret, "time screw in server nonce ");
goto out;
}
}
@@ -618,15 +618,15 @@ _kdc_do_digest(krb5_context context,
}
if (ireq.u.digestRequest.identifier == NULL) {
- krb5_set_error_string(context, "Identifier missing "
- "from CHAP request");
ret = EINVAL;
+ krb5_set_error_message(context, ret, "Identifier missing "
+ "from CHAP request");
goto out;
}
if (hex_decode(*ireq.u.digestRequest.identifier, &id, 1) != 1) {
- krb5_set_error_string(context, "failed to decode identifier");
ret = EINVAL;
+ krb5_set_error_message(context, ret, "failed to decode identifier");
goto out;
}
@@ -714,8 +714,8 @@ _kdc_do_digest(krb5_context context,
MD5_Final(md, &ctx);
hex_encode(md, sizeof(md), &A1);
if (A1 == NULL) {
- krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto failed;
}
@@ -733,8 +733,8 @@ _kdc_do_digest(krb5_context context,
MD5_Final(md, &ctx);
hex_encode(md, sizeof(md), &A2);
if (A2 == NULL) {
- krb5_set_error_string(context, "out of memory");
ret = ENOMEM;
+ krb5_set_error_message(context, ret, "malloc: out of memory");
free(A1);
goto failed;
}
@@ -795,15 +795,15 @@ _kdc_do_digest(krb5_context context,
}
if (ireq.u.digestRequest.clientNonce == NULL) {
- krb5_set_error_string(context,
- "MS-CHAP-V2 clientNonce missing");
ret = EINVAL;
+ krb5_set_error_message(context, ret,
+ "MS-CHAP-V2 clientNonce missing");
goto failed;
}
if (serverNonce.length != 16) {
- krb5_set_error_string(context,
- "MS-CHAP-V2 serverNonce wrong length");
ret = EINVAL;
+ krb5_set_error_message(context, ret,
+ "MS-CHAP-V2 serverNonce wrong length");
goto failed;
}
@@ -824,16 +824,16 @@ _kdc_do_digest(krb5_context context,
clientNonce.data = malloc(clientNonce.length);
if (clientNonce.data == NULL) {
ret = ENOMEM;
- krb5_set_error_string(context, "out of memory");
+ krb5_set_error_message(context, ret, "malloc: out of memory");
goto out;
}
ssize = hex_decode(*ireq.u.digestRequest.clientNonce,
clientNonce.data, clientNonce.length);
if (ssize != 16) {
- krb5_set_error_string(context,
- "Failed to decode clientNonce");
ret = ENOMEM;
--
Samba Shared Repository
More information about the samba-cvs
mailing list