The branch, master has been updated via 2b29b7186459d945ec448694164bfe4239b30d72 (commit) from 698b7fd43658d9e96d28f26c9e1dae5e770bb57f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 2b29b7186459d945ec448694164bfe4239b30d72 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Mon Oct 27 11:35:07 2008 +0100 s4: import lorikeet-heimdal-200810271034 metze ----------------------------------------------------------------------- Summary of changes: source4/heimdal/kdc/524.c | 94 ++-- source4/heimdal/kdc/default_config.c | 150 ++-- source4/heimdal/kdc/digest.c | 220 +++--- source4/heimdal/kdc/headers.h | 54 +- source4/heimdal/kdc/kaserver.c | 86 ++-- source4/heimdal/kdc/kdc.h | 58 +- source4/heimdal/kdc/kdc_locl.h | 54 +- source4/heimdal/kdc/kerberos4.c | 132 ++-- source4/heimdal/kdc/kerberos5.c | 340 +++++----- source4/heimdal/kdc/krb5tgs.c | 50 +- source4/heimdal/kdc/kx509.c | 92 ++-- source4/heimdal/kdc/log.c | 58 +- source4/heimdal/kdc/misc.c | 56 +- source4/heimdal/kdc/pkinit.c | 218 +++--- source4/heimdal/kdc/process.c | 72 +- source4/heimdal/kdc/rx.h | 50 +- source4/heimdal/kdc/windc.c | 60 +- source4/heimdal/kdc/windc_plugin.h | 58 +- source4/heimdal/kpasswd/kpasswd.c | 60 +- source4/heimdal/kpasswd/kpasswd_locl.h | 52 +- source4/heimdal/kuser/kinit.c | 252 ++++--- source4/heimdal/kuser/kuser_locl.h | 70 ++- source4/heimdal/lib/asn1/asn1_gen.c | 64 +- source4/heimdal/lib/asn1/der.c | 50 +- source4/heimdal/lib/asn1/der.h | 50 +- source4/heimdal/lib/asn1/der_cmp.c | 56 +- source4/heimdal/lib/asn1/der_copy.c | 58 +- source4/heimdal/lib/asn1/der_format.c | 56 +- source4/heimdal/lib/asn1/der_free.c | 50 +- source4/heimdal/lib/asn1/der_get.c | 84 +- source4/heimdal/lib/asn1/der_length.c | 52 +- source4/heimdal/lib/asn1/der_locl.h | 50 +- source4/heimdal/lib/asn1/der_put.c | 88 ++-- source4/heimdal/lib/asn1/extra.c | 58 +- source4/heimdal/lib/asn1/gen.c | 78 +- source4/heimdal/lib/asn1/gen_copy.c | 64 +- source4/heimdal/lib/asn1/gen_decode.c | 110 ++-- source4/heimdal/lib/asn1/gen_encode.c | 68 +- source4/heimdal/lib/asn1/gen_free.c | 58 +- source4/heimdal/lib/asn1/gen_glue.c | 52 +- source4/heimdal/lib/asn1/gen_length.c | 68 +- source4/heimdal/lib/asn1/gen_locl.h | 50 +- source4/heimdal/lib/asn1/gen_seq.c | 58 +- source4/heimdal/lib/asn1/hash.c | 50 +- source4/heimdal/lib/asn1/hash.h | 52 +- source4/heimdal/lib/asn1/heim_asn1.h | 50 +- source4/heimdal/lib/asn1/lex.c | 68 +- source4/heimdal/lib/asn1/lex.h | 50 +- source4/heimdal/lib/asn1/lex.l | 68 +- source4/heimdal/lib/asn1/main.c | 50 +- source4/heimdal/lib/asn1/parse.c | 34 +- source4/heimdal/lib/asn1/parse.y | 86 ++-- source4/heimdal/lib/asn1/symbol.c | 2 +- source4/heimdal/lib/asn1/symbol.h | 82 +- source4/heimdal/lib/asn1/timegm.c | 62 +- source4/heimdal/lib/com_err/com_err.c | 68 +- source4/heimdal/lib/com_err/com_err.h | 50 +- source4/heimdal/lib/com_err/com_right.h | 50 +- source4/heimdal/lib/com_err/compile_et.c | 87 ++- source4/heimdal/lib/com_err/compile_et.h | 50 +- source4/heimdal/lib/com_err/error.c | 71 +- source4/heimdal/lib/com_err/lex.c | 52 +- source4/heimdal/lib/com_err/lex.h | 50 +- source4/heimdal/lib/com_err/lex.l | 52 +- source4/heimdal/lib/com_err/parse.c | 52 +- source4/heimdal/lib/com_err/parse.y | 56 +- source4/heimdal/lib/gssapi/gssapi/gssapi.h | 56 +- source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h | 77 ++- source4/heimdal/lib/gssapi/gssapi/gssapi_spnego.h | 50 +- source4/heimdal/lib/gssapi/krb5/8003.c | 78 +- .../heimdal/lib/gssapi/krb5/accept_sec_context.c | 142 ++-- source4/heimdal/lib/gssapi/krb5/acquire_cred.c | 75 +- source4/heimdal/lib/gssapi/krb5/add_cred.c | 62 +- .../heimdal/lib/gssapi/krb5/address_to_krb5addr.c | 68 +- source4/heimdal/lib/gssapi/krb5/arcfour.c | 106 ++-- .../heimdal/lib/gssapi/krb5/canonicalize_name.c | 50 +- source4/heimdal/lib/gssapi/krb5/cfx.c | 22 +- source4/heimdal/lib/gssapi/krb5/compare_name.c | 50 +- source4/heimdal/lib/gssapi/krb5/compat.c | 60 +- source4/heimdal/lib/gssapi/krb5/context_time.c | 54 +- source4/heimdal/lib/gssapi/krb5/copy_ccache.c | 54 +- source4/heimdal/lib/gssapi/krb5/decapsulate.c | 54 +- .../heimdal/lib/gssapi/krb5/delete_sec_context.c | 50 +- source4/heimdal/lib/gssapi/krb5/display_name.c | 50 +- source4/heimdal/lib/gssapi/krb5/display_status.c | 58 +- source4/heimdal/lib/gssapi/krb5/duplicate_name.c | 50 +- source4/heimdal/lib/gssapi/krb5/encapsulate.c | 56 +- source4/heimdal/lib/gssapi/krb5/export_name.c | 50 +- .../heimdal/lib/gssapi/krb5/export_sec_context.c | 50 +- source4/heimdal/lib/gssapi/krb5/external.c | 59 +- source4/heimdal/lib/gssapi/krb5/get_mic.c | 60 +- source4/heimdal/lib/gssapi/krb5/gsskrb5_locl.h | 52 +- source4/heimdal/lib/gssapi/krb5/import_name.c | 56 +- .../heimdal/lib/gssapi/krb5/import_sec_context.c | 56 +- source4/heimdal/lib/gssapi/krb5/indicate_mechs.c | 50 +- source4/heimdal/lib/gssapi/krb5/init.c | 50 +- source4/heimdal/lib/gssapi/krb5/init_sec_context.c | 198 +++--- source4/heimdal/lib/gssapi/krb5/inquire_context.c | 52 +- source4/heimdal/lib/gssapi/krb5/inquire_cred.c | 60 +- .../heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c | 54 +- .../lib/gssapi/krb5/inquire_mechs_for_name.c | 50 +- .../lib/gssapi/krb5/inquire_names_for_mech.c | 54 +- .../lib/gssapi/krb5/inquire_sec_context_by_oid.c | 20 +- source4/heimdal/lib/gssapi/krb5/prf.c | 50 +- .../lib/gssapi/krb5/process_context_token.c | 52 +- source4/heimdal/lib/gssapi/krb5/release_buffer.c | 50 +- source4/heimdal/lib/gssapi/krb5/release_cred.c | 54 +- source4/heimdal/lib/gssapi/krb5/release_name.c | 50 +- source4/heimdal/lib/gssapi/krb5/sequence.c | 86 ++-- .../lib/gssapi/krb5/set_sec_context_option.c | 14 +- source4/heimdal/lib/gssapi/krb5/unwrap.c | 58 +- source4/heimdal/lib/gssapi/krb5/verify_mic.c | 58 +- source4/heimdal/lib/gssapi/krb5/wrap.c | 70 +- source4/heimdal/lib/gssapi/mech/context.c | 8 +- .../lib/gssapi/mech/gss_accept_sec_context.c | 11 +- .../lib/gssapi/mech/gss_add_oid_set_member.c | 50 +- .../lib/gssapi/mech/gss_decapsulate_token.c | 52 +- .../heimdal/lib/gssapi/mech/gss_display_status.c | 50 +- .../heimdal/lib/gssapi/mech/gss_duplicate_name.c | 4 +- .../heimdal/lib/gssapi/mech/gss_duplicate_oid.c | 50 +- .../lib/gssapi/mech/gss_encapsulate_token.c | 50 +- .../lib/gssapi/mech/gss_inquire_cred_by_oid.c | 2 +- .../lib/gssapi/mech/gss_inquire_mechs_for_name.c | 2 +- source4/heimdal/lib/gssapi/mech/gss_krb5.c | 68 ++- source4/heimdal/lib/gssapi/mech/gss_mech_switch.c | 2 + source4/heimdal/lib/gssapi/mech/gss_names.c | 2 +- source4/heimdal/lib/gssapi/mech/gss_oid_equal.c | 50 +- source4/heimdal/lib/gssapi/mech/gss_oid_to_str.c | 52 +- .../heimdal/lib/gssapi/mech/gss_pseudo_random.c | 52 +- source4/heimdal/lib/gssapi/mech/gss_release_oid.c | 50 +- source4/heimdal/lib/gssapi/mech/mech_locl.h | 50 +- source4/heimdal/lib/gssapi/mech/mechqueue.h | 4 +- source4/heimdal/lib/gssapi/mech/name.h | 2 +- .../heimdal/lib/gssapi/spnego/accept_sec_context.c | 86 ++-- source4/heimdal/lib/gssapi/spnego/context_stubs.c | 6 +- source4/heimdal/lib/gssapi/spnego/cred_stubs.c | 6 +- source4/heimdal/lib/gssapi/spnego/external.c | 2 +- .../heimdal/lib/gssapi/spnego/init_sec_context.c | 60 +- source4/heimdal/lib/hcrypto/aes.c | 12 +- source4/heimdal/lib/hcrypto/aes.h | 12 +- source4/heimdal/lib/hcrypto/bn.c | 58 +- source4/heimdal/lib/hcrypto/bn.h | 50 +- source4/heimdal/lib/hcrypto/camellia-ntt.c | 22 +- source4/heimdal/lib/hcrypto/camellia-ntt.h | 12 +- source4/heimdal/lib/hcrypto/camellia.c | 18 +- source4/heimdal/lib/hcrypto/camellia.h | 12 +- source4/heimdal/lib/hcrypto/des-tables.h | 258 ++++---- source4/heimdal/lib/hcrypto/des.c | 26 +- source4/heimdal/lib/hcrypto/des.h | 16 +- source4/heimdal/lib/hcrypto/dh-imath.c | 52 +- source4/heimdal/lib/hcrypto/dh.c | 68 +- source4/heimdal/lib/hcrypto/dh.h | 50 +- source4/heimdal/lib/hcrypto/dsa.c | 50 +- source4/heimdal/lib/hcrypto/dsa.h | 50 +- source4/heimdal/lib/hcrypto/engine.c | 58 +- source4/heimdal/lib/hcrypto/engine.h | 50 +- source4/heimdal/lib/hcrypto/evp-aes-cts.c | 56 +- source4/heimdal/lib/hcrypto/evp-hcrypto.c | 52 +- source4/heimdal/lib/hcrypto/evp.c | 105 ++- source4/heimdal/lib/hcrypto/evp.h | 29 +- source4/heimdal/lib/hcrypto/hash.h | 22 +- source4/heimdal/lib/hcrypto/hmac.c | 52 +- source4/heimdal/lib/hcrypto/hmac.h | 12 +- source4/heimdal/lib/hcrypto/imath/LICENSE | 2 +- source4/heimdal/lib/hcrypto/imath/imath.c | 272 ++++---- source4/heimdal/lib/hcrypto/imath/imath.h | 12 +- source4/heimdal/lib/hcrypto/md2.c | 12 +- source4/heimdal/lib/hcrypto/md2.h | 12 +- source4/heimdal/lib/hcrypto/md4.c | 12 +- source4/heimdal/lib/hcrypto/md4.h | 12 +- source4/heimdal/lib/hcrypto/md5.c | 12 +- source4/heimdal/lib/hcrypto/md5.h | 12 +- source4/heimdal/lib/hcrypto/pkcs12.c | 60 +- source4/heimdal/lib/hcrypto/pkcs12.h | 50 +- source4/heimdal/lib/hcrypto/pkcs5.c | 54 +- source4/heimdal/lib/hcrypto/rand-egd.c | 60 +- source4/heimdal/lib/hcrypto/rand-fortuna.c | 4 +- source4/heimdal/lib/hcrypto/rand-timer.c | 58 +- source4/heimdal/lib/hcrypto/rand-unix.c | 52 +- source4/heimdal/lib/hcrypto/rand.c | 64 +- source4/heimdal/lib/hcrypto/rand.h | 50 +- source4/heimdal/lib/hcrypto/randi.h | 50 +- source4/heimdal/lib/hcrypto/rc2.c | 74 +- source4/heimdal/lib/hcrypto/rc2.h | 14 +- source4/heimdal/lib/hcrypto/rc4.c | 12 +- source4/heimdal/lib/hcrypto/rc4.h | 12 +- source4/heimdal/lib/hcrypto/resource.h | 2 +- source4/heimdal/lib/hcrypto/rnd_keys.c | 12 +- source4/heimdal/lib/hcrypto/rsa-imath.c | 72 +- source4/heimdal/lib/hcrypto/rsa.c | 68 +- source4/heimdal/lib/hcrypto/rsa.h | 50 +- source4/heimdal/lib/hcrypto/sha.c | 12 +- source4/heimdal/lib/hcrypto/sha.h | 12 +- source4/heimdal/lib/hcrypto/sha256.c | 16 +- source4/heimdal/lib/hcrypto/ui.c | 62 +- source4/heimdal/lib/hcrypto/ui.h | 12 +- source4/heimdal/lib/hdb/db.c | 78 +- source4/heimdal/lib/hdb/dbinfo.c | 56 +- source4/heimdal/lib/hdb/ext.c | 92 ++-- source4/heimdal/lib/hdb/hdb.c | 90 ++-- source4/heimdal/lib/hdb/hdb.h | 58 +- source4/heimdal/lib/hdb/hdb_locl.h | 50 +- source4/heimdal/lib/hdb/keys.c | 110 ++-- source4/heimdal/lib/hdb/keytab.c | 66 +- source4/heimdal/lib/hdb/mkey.c | 112 ++-- source4/heimdal/lib/hdb/ndbm.c | 62 +- source4/heimdal/lib/hx509/ca.c | 128 ++-- source4/heimdal/lib/hx509/cert.c | 242 +++--- source4/heimdal/lib/hx509/cms.c | 16 +- source4/heimdal/lib/hx509/collector.c | 64 +- source4/heimdal/lib/hx509/crypto.c | 200 +++--- source4/heimdal/lib/hx509/env.c | 68 +- source4/heimdal/lib/hx509/error.c | 68 +- source4/heimdal/lib/hx509/file.c | 64 +- source4/heimdal/lib/hx509/hx509.h | 50 +- source4/heimdal/lib/hx509/hx_locl.h | 56 +- source4/heimdal/lib/hx509/keyset.c | 94 ++-- source4/heimdal/lib/hx509/ks_dir.c | 56 +- source4/heimdal/lib/hx509/ks_file.c | 84 +- source4/heimdal/lib/hx509/ks_keychain.c | 76 +- source4/heimdal/lib/hx509/ks_mem.c | 62 +- source4/heimdal/lib/hx509/ks_null.c | 52 +- source4/heimdal/lib/hx509/ks_p11.c | 128 ++-- source4/heimdal/lib/hx509/ks_p12.c | 92 ++-- source4/heimdal/lib/hx509/lock.c | 60 +- source4/heimdal/lib/hx509/name.c | 104 ++-- source4/heimdal/lib/hx509/peer.c | 60 +- source4/heimdal/lib/hx509/print.c | 156 ++-- source4/heimdal/lib/hx509/req.c | 58 +- source4/heimdal/lib/hx509/revoke.c | 130 ++-- source4/heimdal/lib/hx509/sel-gram.c | 6 +- source4/heimdal/lib/hx509/sel-gram.y | 60 +- source4/heimdal/lib/hx509/sel-lex.c | 54 +- source4/heimdal/lib/hx509/sel-lex.l | 54 +- source4/heimdal/lib/hx509/sel.c | 60 +- source4/heimdal/lib/hx509/sel.h | 52 +- source4/heimdal/lib/hx509/test_name.c | 304 +++++++- source4/heimdal/lib/krb5/acache.c | 170 +++-- source4/heimdal/lib/krb5/add_et_list.c | 60 +- source4/heimdal/lib/krb5/addr_families.c | 164 +++-- source4/heimdal/lib/krb5/appdefault.c | 120 ++-- source4/heimdal/lib/krb5/asn1_glue.c | 50 +- source4/heimdal/lib/krb5/auth_context.c | 66 +- source4/heimdal/lib/krb5/build_ap_req.c | 54 +- source4/heimdal/lib/krb5/build_auth.c | 68 +- source4/heimdal/lib/krb5/cache.c | 452 +++++++++--- source4/heimdal/lib/krb5/changepw.c | 114 ++-- source4/heimdal/lib/krb5/codec.c | 73 ++- source4/heimdal/lib/krb5/config_file.c | 112 ++- source4/heimdal/lib/krb5/config_file_netinfo.c | 50 +- source4/heimdal/lib/krb5/constants.c | 52 +- source4/heimdal/lib/krb5/context.c | 324 ++++++--- source4/heimdal/lib/krb5/convert_creds.c | 76 +- source4/heimdal/lib/krb5/copy_host_realm.c | 56 +- source4/heimdal/lib/krb5/crc.c | 52 +- source4/heimdal/lib/krb5/creds.c | 95 ++- source4/heimdal/lib/krb5/crypto.c | 792 +++++++++++--------- source4/heimdal/lib/krb5/data.c | 84 +- source4/heimdal/lib/krb5/eai_to_heim_errno.c | 50 +- source4/heimdal/lib/krb5/error_string.c | 94 ++- source4/heimdal/lib/krb5/expand_hostname.c | 55 +- source4/heimdal/lib/krb5/fcache.c | 216 ++++--- source4/heimdal/lib/krb5/free.c | 50 +- source4/heimdal/lib/krb5/free_host_realm.c | 50 +- source4/heimdal/lib/krb5/generate_seq_number.c | 50 +- source4/heimdal/lib/krb5/generate_subkey.c | 52 +- source4/heimdal/lib/krb5/get_cred.c | 101 ++- source4/heimdal/lib/krb5/get_default_principal.c | 57 +- source4/heimdal/lib/krb5/get_default_realm.c | 55 +- source4/heimdal/lib/krb5/get_for_creds.c | 85 ++- source4/heimdal/lib/krb5/get_host_realm.c | 71 +- source4/heimdal/lib/krb5/get_in_tkt.c | 229 +++--- source4/heimdal/lib/krb5/get_in_tkt_with_keytab.c | 50 +- source4/heimdal/lib/krb5/get_port.c | 52 +- source4/heimdal/lib/krb5/heim_threads.h | 52 +- source4/heimdal/lib/krb5/init_creds.c | 37 +- source4/heimdal/lib/krb5/init_creds_pw.c | 192 +++--- source4/heimdal/lib/krb5/kcm.c | 45 +- source4/heimdal/lib/krb5/keyblock.c | 53 +- source4/heimdal/lib/krb5/keytab.c | 103 ++-- source4/heimdal/lib/krb5/keytab_any.c | 82 ++- source4/heimdal/lib/krb5/keytab_file.c | 245 ++++-- source4/heimdal/lib/krb5/keytab_keyfile.c | 153 +++-- source4/heimdal/lib/krb5/keytab_memory.c | 93 ++-- source4/heimdal/lib/krb5/krb5-v4compat.h | 52 +- source4/heimdal/lib/krb5/krb5.h | 86 ++- source4/heimdal/lib/krb5/krb5_ccapi.h | 62 +- source4/heimdal/lib/krb5/krb5_locl.h | 61 +- source4/heimdal/lib/krb5/krbhst.c | 137 ++-- source4/heimdal/lib/krb5/locate_plugin.h | 54 +- source4/heimdal/lib/krb5/log.c | 89 ++- source4/heimdal/lib/krb5/mcache.c | 91 ++- source4/heimdal/lib/krb5/misc.c | 58 +- source4/heimdal/lib/krb5/mit_glue.c | 108 ++-- source4/heimdal/lib/krb5/mk_error.c | 50 +- source4/heimdal/lib/krb5/mk_priv.c | 63 +- source4/heimdal/lib/krb5/mk_rep.c | 60 +- source4/heimdal/lib/krb5/mk_req.c | 52 +- source4/heimdal/lib/krb5/mk_req_ext.c | 68 +- source4/heimdal/lib/krb5/n-fold.c | 32 +- source4/heimdal/lib/krb5/pac.c | 196 +++-- source4/heimdal/lib/krb5/padata.c | 57 +- source4/heimdal/lib/krb5/pkinit.c | 399 ++++++----- source4/heimdal/lib/krb5/plugin.c | 67 +- source4/heimdal/lib/krb5/principal.c | 248 ++++--- source4/heimdal/lib/krb5/prog_setup.c | 56 +- source4/heimdal/lib/krb5/prompter_posix.c | 50 +- source4/heimdal/lib/krb5/rd_cred.c | 105 ++-- source4/heimdal/lib/krb5/rd_error.c | 68 +- source4/heimdal/lib/krb5/rd_priv.c | 76 +- source4/heimdal/lib/krb5/rd_rep.c | 70 +- source4/heimdal/lib/krb5/rd_req.c | 159 ++-- source4/heimdal/lib/krb5/replay.c | 80 +- source4/heimdal/lib/krb5/send_to_kdc.c | 98 ++- source4/heimdal/lib/krb5/send_to_kdc_plugin.h | 54 +- source4/heimdal/lib/krb5/set_default_realm.c | 60 +- source4/heimdal/lib/krb5/store-int.h | 50 +- source4/heimdal/lib/krb5/store.c | 54 +- source4/heimdal/lib/krb5/store_emem.c | 50 +- source4/heimdal/lib/krb5/store_fd.c | 2 +- source4/heimdal/lib/krb5/store_mem.c | 50 +- source4/heimdal/lib/krb5/ticket.c | 121 ++-- source4/heimdal/lib/krb5/time.c | 56 +- source4/heimdal/lib/krb5/transited.c | 129 ++-- source4/heimdal/lib/krb5/v4_glue.c | 177 +++-- source4/heimdal/lib/krb5/version.c | 50 +- source4/heimdal/lib/krb5/warn.c | 64 +- source4/heimdal/lib/ntlm/heimntlm.h | 50 +- source4/heimdal/lib/ntlm/ntlm.c | 133 ++-- source4/heimdal/lib/roken/base64.c | 6 +- source4/heimdal/lib/roken/base64.h | 12 +- source4/heimdal/lib/roken/bswap.c | 12 +- source4/heimdal/lib/roken/cloexec.c | 12 +- source4/heimdal/lib/roken/closefrom.c | 50 +- source4/heimdal/lib/roken/copyhostent.c | 12 +- source4/heimdal/lib/roken/dumpdata.c | 12 +- source4/heimdal/lib/roken/ecalloc.c | 12 +- source4/heimdal/lib/roken/emalloc.c | 12 +- source4/heimdal/lib/roken/erealloc.c | 12 +- source4/heimdal/lib/roken/err.hin | 2 +- source4/heimdal/lib/roken/estrdup.c | 12 +- source4/heimdal/lib/roken/freeaddrinfo.c | 12 +- source4/heimdal/lib/roken/freehostent.c | 12 +- source4/heimdal/lib/roken/gai_strerror.c | 12 +- source4/heimdal/lib/roken/get_window_size.c | 14 +- source4/heimdal/lib/roken/getaddrinfo.c | 12 +- source4/heimdal/lib/roken/getarg.c | 133 ++-- source4/heimdal/lib/roken/getarg.h | 68 +- source4/heimdal/lib/roken/getipnodebyaddr.c | 12 +- source4/heimdal/lib/roken/getipnodebyname.c | 12 +- source4/heimdal/lib/roken/getnameinfo.c | 12 +- source4/heimdal/lib/roken/getprogname.c | 14 +- source4/heimdal/lib/roken/h_errno.c | 12 +- source4/heimdal/lib/roken/hex.c | 8 +- source4/heimdal/lib/roken/hex.h | 12 +- source4/heimdal/lib/roken/hostent_find_fqdn.c | 12 +- source4/heimdal/lib/roken/inet_aton.c | 12 +- source4/heimdal/lib/roken/inet_ntop.c | 12 +- source4/heimdal/lib/roken/inet_pton.c | 12 +- source4/heimdal/lib/roken/issuid.c | 50 +- source4/heimdal/lib/roken/net_read.c | 12 +- source4/heimdal/lib/roken/net_write.c | 12 +- source4/heimdal/lib/roken/parse_bytes.h | 50 +- source4/heimdal/lib/roken/parse_time.c | 50 +- source4/heimdal/lib/roken/parse_time.h | 50 +- source4/heimdal/lib/roken/parse_units.c | 50 +- source4/heimdal/lib/roken/parse_units.h | 50 +- source4/heimdal/lib/roken/resolve.c | 44 +- source4/heimdal/lib/roken/resolve.h | 12 +- source4/heimdal/lib/roken/rkpty.c | 10 +- source4/heimdal/lib/roken/roken-common.h | 20 +- source4/heimdal/lib/roken/roken.h.in | 6 +- source4/heimdal/lib/roken/roken_gethostby.c | 64 +- source4/heimdal/lib/roken/rtbl.c | 16 +- source4/heimdal/lib/roken/rtbl.h | 12 +- source4/heimdal/lib/roken/setprogname.c | 14 +- source4/heimdal/lib/roken/signal.c | 12 +- source4/heimdal/lib/roken/simple_exec.c | 66 +- source4/heimdal/lib/roken/socket.c | 14 +- source4/heimdal/lib/roken/strcollect.c | 50 +- source4/heimdal/lib/roken/strlwr.c | 12 +- source4/heimdal/lib/roken/strpool.c | 50 +- source4/heimdal/lib/roken/strsep.c | 50 +- source4/heimdal/lib/roken/strsep_copy.c | 50 +- source4/heimdal/lib/roken/strupr.c | 12 +- source4/heimdal/lib/roken/xfree.c | 12 +- source4/heimdal/lib/vers/print_version.c | 56 +- source4/heimdal/lib/wind/UnicodeData.py | 2 +- source4/heimdal/lib/wind/bidi.c | 50 +- source4/heimdal/lib/wind/combining.c | 50 +- source4/heimdal/lib/wind/errorlist.c | 50 +- source4/heimdal/lib/wind/gen-bidi.py | 2 +- source4/heimdal/lib/wind/gen-combining.py | 2 +- source4/heimdal/lib/wind/gen-errorlist.py | 2 +- source4/heimdal/lib/wind/gen-map.py | 2 +- source4/heimdal/lib/wind/gen-normalize.py | 2 +- source4/heimdal/lib/wind/generate.py | 2 +- source4/heimdal/lib/wind/ldap.c | 54 +- source4/heimdal/lib/wind/map.c | 50 +- source4/heimdal/lib/wind/normalize.c | 50 +- source4/heimdal/lib/wind/rfc3454.py | 2 +- source4/heimdal/lib/wind/rfc4518.py | 2 +- source4/heimdal/lib/wind/stringprep.c | 50 +- source4/heimdal/lib/wind/stringprep.py | 2 +- source4/heimdal/lib/wind/utf8.c | 74 +- source4/heimdal/lib/wind/util.py | 2 +- source4/heimdal/lib/wind/wind.h | 50 +- source4/heimdal/lib/wind/windlocl.h | 50 +- 408 files changed, 13824 insertions(+), 12179 deletions(-) mode change 100755 => 100644 source4/heimdal/lib/wind/gen-bidi.py mode change 100755 => 100644 source4/heimdal/lib/wind/gen-combining.py mode change 100755 => 100644 source4/heimdal/lib/wind/gen-errorlist.py mode change 100755 => 100644 source4/heimdal/lib/wind/gen-map.py mode change 100755 => 100644 source4/heimdal/lib/wind/gen-normalize.py Changeset truncated at 500 lines: diff --git a/source4/heimdal/kdc/524.c b/source4/heimdal/kdc/524.c index a46c917..d153103 100644 --- a/source4/heimdal/kdc/524.c +++ b/source4/heimdal/kdc/524.c @@ -1,34 +1,34 @@ /* - * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. + * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include "kdc_locl.h" @@ -43,7 +43,7 @@ RCSID("$Id$"); */ static krb5_error_code -fetch_server (krb5_context context, +fetch_server (krb5_context context, krb5_kdc_configuration *config, const Ticket *t, char **spn, @@ -67,7 +67,7 @@ fetch_server (krb5_context context, krb5_get_err_text(context, ret)); return ret; } - ret = _kdc_db_fetch(context, config, sprinc, HDB_F_GET_SERVER, + ret = _kdc_db_fetch(context, config, sprinc, HDB_F_GET_SERVER, NULL, server); krb5_free_principal(context, sprinc); if (ret) { @@ -82,7 +82,7 @@ fetch_server (krb5_context context, } static krb5_error_code -log_524 (krb5_context context, +log_524 (krb5_context context, krb5_kdc_configuration *config, const EncTicketPart *et, const char *from, @@ -92,7 +92,7 @@ log_524 (krb5_context context, char *cpn; krb5_error_code ret; - ret = _krb5_principalname2krb5_principal(context, &client, + ret = _krb5_principalname2krb5_principal(context, &client, et->cname, et->crealm); if (ret) { kdc_log(context, config, 0, "_krb5_principalname2krb5_principal: %s", @@ -113,7 +113,7 @@ log_524 (krb5_context context, } static krb5_error_code -verify_flags (krb5_context context, +verify_flags (krb5_context context, krb5_kdc_configuration *config, const EncTicketPart *et, const char *spn) @@ -135,7 +135,7 @@ verify_flags (krb5_context context, */ static krb5_error_code -set_address (krb5_context context, +set_address (krb5_context context, krb5_kdc_configuration *config, EncTicketPart *et, struct sockaddr *addr, @@ -154,7 +154,7 @@ set_address (krb5_context context, kdc_log(context, config, 0, "Failed to convert address (%s)", from); return ret; } - + if (et->caddr && !krb5_address_search (context, v4_addr, et->caddr)) { kdc_log(context, config, 0, "Incorrect network address (%s)", from); krb5_free_address(context, v4_addr); @@ -187,11 +187,11 @@ set_address (krb5_context context, static krb5_error_code -encrypt_v4_ticket(krb5_context context, +encrypt_v4_ticket(krb5_context context, krb5_kdc_configuration *config, - void *buf, - size_t len, - krb5_keyblock *skey, + void *buf, + size_t len, + krb5_keyblock *skey, EncryptedData *reply) { krb5_crypto crypto; @@ -204,7 +204,7 @@ encrypt_v4_ticket(krb5_context context, return ret; } - ret = krb5_encrypt_EncryptedData(context, + ret = krb5_encrypt_EncryptedData(context, crypto, KRB5_KU_TICKET, buf, @@ -221,10 +221,10 @@ encrypt_v4_ticket(krb5_context context, } static krb5_error_code -encode_524_response(krb5_context context, +encode_524_response(krb5_context context, krb5_kdc_configuration *config, const char *spn, const EncTicketPart et, - const Ticket *t, hdb_entry_ex *server, + const Ticket *t, hdb_entry_ex *server, EncryptedData *ticket, int *kvno) { krb5_error_code ret; @@ -233,12 +233,12 @@ encode_524_response(krb5_context context, use_2b = krb5_config_get_bool(context, NULL, "kdc", "use_2b", spn, NULL); if(use_2b) { - ASN1_MALLOC_ENCODE(EncryptedData, - ticket->cipher.data, ticket->cipher.length, + ASN1_MALLOC_ENCODE(EncryptedData, + ticket->cipher.data, ticket->cipher.length, &t->enc_part, &len, ret); if (ret) { - kdc_log(context, config, 0, + kdc_log(context, config, 0, "Failed to encode v4 (2b) ticket (%s)", spn); return ret; } @@ -256,7 +256,7 @@ encode_524_response(krb5_context context, return KRB5KDC_ERR_POLICY; } - ret = _kdc_encode_v4_ticket(context, config, + ret = _kdc_encode_v4_ticket(context, config, buf + sizeof(buf) - 1, sizeof(buf), &et, &t->sname, &len); if(ret){ @@ -270,7 +270,7 @@ encode_524_response(krb5_context context, "no suitable DES key for server (%s)", spn); return ret; } - ret = encrypt_v4_ticket(context, config, buf + sizeof(buf) - len, len, + ret = encrypt_v4_ticket(context, config, buf + sizeof(buf) - len, len, &skey->key, ticket); if(ret){ kdc_log(context, config, 0, @@ -289,7 +289,7 @@ encode_524_response(krb5_context context, */ krb5_error_code -_kdc_do_524(krb5_context context, +_kdc_do_524(krb5_context context, krb5_kdc_configuration *config, const Ticket *t, krb5_data *reply, const char *from, struct sockaddr *addr) @@ -306,7 +306,7 @@ _kdc_do_524(krb5_context context, unsigned char buf[MAX_KTXT_LEN + 4 * 4]; size_t len; int kvno = 0; - + if(!config->enable_524) { ret = KRB5KDC_ERR_POLICY; kdc_log(context, config, 0, @@ -342,7 +342,7 @@ _kdc_do_524(krb5_context context, "Failed to decrypt ticket from %s for %s", from, spn); goto out; } - ret = krb5_decode_EncTicketPart(context, et_data.data, et_data.length, + ret = krb5_decode_EncTicketPart(context, et_data.data, et_data.length, &et, &len); krb5_data_free(&et_data); if(ret){ diff --git a/source4/heimdal/kdc/default_config.c b/source4/heimdal/kdc/default_config.c index 87952ca..60fbc92 100644 --- a/source4/heimdal/kdc/default_config.c +++ b/source4/heimdal/kdc/default_config.c @@ -1,35 +1,35 @@ /* - * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). + * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). * - * All rights reserved. + * All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include "kdc_locl.h" @@ -68,32 +68,32 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) c->logf = NULL; c->require_preauth = - krb5_config_get_bool_default(context, NULL, + krb5_config_get_bool_default(context, NULL, c->require_preauth, "kdc", "require-preauth", NULL); - c->enable_v4 = - krb5_config_get_bool_default(context, NULL, - c->enable_v4, + c->enable_v4 = + krb5_config_get_bool_default(context, NULL, + c->enable_v4, "kdc", "enable-kerberos4", NULL); c->enable_v4_cross_realm = krb5_config_get_bool_default(context, NULL, - c->enable_v4_cross_realm, + c->enable_v4_cross_realm, "kdc", "enable-kerberos4-cross-realm", NULL); c->enable_524 = - krb5_config_get_bool_default(context, NULL, - c->enable_v4, + krb5_config_get_bool_default(context, NULL, + c->enable_v4, "kdc", "enable-524", NULL); - c->enable_digest = - krb5_config_get_bool_default(context, NULL, + c->enable_digest = + krb5_config_get_bool_default(context, NULL, FALSE, "kdc", "enable-digest", NULL); { const char *digests; - digests = krb5_config_get_string(context, NULL, - "kdc", + digests = krb5_config_get_string(context, NULL, + "kdc", "digests_allowed", NULL); if (digests == NULL) digests = "ntlm-v2"; @@ -111,17 +111,17 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) } } - c->enable_kx509 = - krb5_config_get_bool_default(context, NULL, - FALSE, + c->enable_kx509 = + krb5_config_get_bool_default(context, NULL, + FALSE, "kdc", "enable-kx509", NULL); if (c->enable_kx509) { c->kx509_template = - krb5_config_get_string(context, NULL, + krb5_config_get_string(context, NULL, "kdc", "kx509_template", NULL); c->kx509_ca = - krb5_config_get_string(context, NULL, + krb5_config_get_string(context, NULL, "kdc", "kx509_ca", NULL); if (c->kx509_ca == NULL || c->kx509_template == NULL) { kdc_log(context, c, 0, @@ -130,26 +130,26 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) } } - c->check_ticket_addresses = - krb5_config_get_bool_default(context, NULL, - c->check_ticket_addresses, - "kdc", + c->check_ticket_addresses = + krb5_config_get_bool_default(context, NULL, + c->check_ticket_addresses, + "kdc", "check-ticket-addresses", NULL); - c->allow_null_ticket_addresses = - krb5_config_get_bool_default(context, NULL, - c->allow_null_ticket_addresses, - "kdc", + c->allow_null_ticket_addresses = + krb5_config_get_bool_default(context, NULL, + c->allow_null_ticket_addresses, + "kdc", "allow-null-ticket-addresses", NULL); - c->allow_anonymous = - krb5_config_get_bool_default(context, NULL, + c->allow_anonymous = + krb5_config_get_bool_default(context, NULL, c->allow_anonymous, - "kdc", + "kdc", "allow-anonymous", NULL); c->max_datagram_reply_length = - krb5_config_get_int_default(context, - NULL, + krb5_config_get_int_default(context, + NULL, 1400, "kdc", "max-kdc-datagram-reply-length", @@ -158,8 +158,8 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) { const char *trpolicy_str; - trpolicy_str = - krb5_config_get_string_default(context, NULL, "DEFAULT", "kdc", + trpolicy_str = + krb5_config_get_string_default(context, NULL, "DEFAULT", "kdc", "transited-policy", NULL); if(strcasecmp(trpolicy_str, "always-check") == 0) { c->trpolicy = TRPOLICY_ALWAYS_CHECK; @@ -167,19 +167,19 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) c->trpolicy = TRPOLICY_ALLOW_PER_PRINCIPAL; } else if(strcasecmp(trpolicy_str, "always-honour-request") == 0) { c->trpolicy = TRPOLICY_ALWAYS_HONOUR_REQUEST; - } else if(strcasecmp(trpolicy_str, "DEFAULT") == 0) { + } else if(strcasecmp(trpolicy_str, "DEFAULT") == 0) { /* default */ } else { kdc_log(context, c, 0, "unknown transited-policy: %s, " - "reverting to default (always-check)", + "reverting to default (always-check)", trpolicy_str); } } { const char *p; - p = krb5_config_get_string (context, NULL, + p = krb5_config_get_string (context, NULL, "kdc", "v4-realm", NULL); @@ -192,19 +192,19 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) } } - c->enable_kaserver = - krb5_config_get_bool_default(context, - NULL, + c->enable_kaserver = + krb5_config_get_bool_default(context, + NULL, c->enable_kaserver, "kdc", "enable-kaserver", NULL); c->encode_as_rep_as_tgs_rep = - krb5_config_get_bool_default(context, NULL, - c->encode_as_rep_as_tgs_rep, - "kdc", + krb5_config_get_bool_default(context, NULL, + c->encode_as_rep_as_tgs_rep, + "kdc", "encode_as_rep_as_tgs_rep", NULL); - + c->kdc_warn_pwexpire = krb5_config_get_time_default (context, NULL, c->kdc_warn_pwexpire, @@ -212,9 +212,9 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) #ifdef PKINIT - c->enable_pkinit = - krb5_config_get_bool_default(context, - NULL, + c->enable_pkinit = + krb5_config_get_bool_default(context, + NULL, c->enable_pkinit, "kdc", "enable-pkinit", @@ -223,7 +223,7 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) const char *user_id, *anchors, *ocsp_file; char **pool_list, **revoke_list; - user_id = + user_id = krb5_config_get_string(context, NULL, "kdc", "pkinit_identity", NULL); if (user_id == NULL) @@ -242,7 +242,7 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) krb5_config_get_strings(context, NULL, "kdc", "pkinit_revoke", NULL); - ocsp_file = + ocsp_file = krb5_config_get_string(context, NULL, "kdc", "pkinit_kdc_ocsp", NULL); if (ocsp_file) { @@ -251,20 +251,20 @@ krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) krb5_errx(context, 1, "out of memory"); } - _kdc_pk_initialize(context, c, user_id, anchors, + _kdc_pk_initialize(context, c, user_id, anchors, pool_list, revoke_list); krb5_config_free_strings(pool_list); krb5_config_free_strings(revoke_list); -- Samba Shared Repository