heimdal: import heimdal's trunk svn rev 23697 + lorikeet-heimdal patches
authorStefan Metzmacher <metze@samba.org>
Tue, 26 Aug 2008 17:35:52 +0000 (19:35 +0200)
committerStefan Metzmacher <metze@samba.org>
Tue, 26 Aug 2008 17:46:38 +0000 (19:46 +0200)
This is based on f56a3b1846c7d462542f2e9527f4d0ed8a34748d in my heimdal-wip repo.

metze
(This used to be commit 467a1f2163a63cdf1a4c83a69473db50e8794f53)

465 files changed:
source4/heimdal/README
source4/heimdal/cf/check-var.m4
source4/heimdal/cf/find-func-no-libs.m4
source4/heimdal/cf/find-func-no-libs2.m4
source4/heimdal/cf/find-func.m4
source4/heimdal/cf/make-proto.pl
source4/heimdal/cf/resolv.m4
source4/heimdal/kdc/524.c
source4/heimdal/kdc/default_config.c
source4/heimdal/kdc/digest.c
source4/heimdal/kdc/headers.h
source4/heimdal/kdc/kaserver.c
source4/heimdal/kdc/kdc.h
source4/heimdal/kdc/kdc_locl.h
source4/heimdal/kdc/kerberos4.c
source4/heimdal/kdc/kerberos5.c
source4/heimdal/kdc/krb5tgs.c
source4/heimdal/kdc/kx509.c
source4/heimdal/kdc/log.c
source4/heimdal/kdc/misc.c
source4/heimdal/kdc/pkinit.c [changed mode: 0755->0644]
source4/heimdal/kdc/process.c
source4/heimdal/kdc/rx.h
source4/heimdal/kdc/windc.c
source4/heimdal/kdc/windc_plugin.h
source4/heimdal/kuser/kinit.c
source4/heimdal/kuser/kuser_locl.h
source4/heimdal/lib/asn1/CMS.asn1
source4/heimdal/lib/asn1/asn1-common.h
source4/heimdal/lib/asn1/asn1_err.et
source4/heimdal/lib/asn1/asn1_gen.c
source4/heimdal/lib/asn1/asn1_queue.h
source4/heimdal/lib/asn1/canthandle.asn1
source4/heimdal/lib/asn1/der.c
source4/heimdal/lib/asn1/der.h
source4/heimdal/lib/asn1/der_cmp.c [changed mode: 0755->0644]
source4/heimdal/lib/asn1/der_copy.c
source4/heimdal/lib/asn1/der_format.c
source4/heimdal/lib/asn1/der_free.c
source4/heimdal/lib/asn1/der_get.c
source4/heimdal/lib/asn1/der_length.c
source4/heimdal/lib/asn1/der_locl.h
source4/heimdal/lib/asn1/der_put.c
source4/heimdal/lib/asn1/digest.asn1
source4/heimdal/lib/asn1/extra.c
source4/heimdal/lib/asn1/gen.c
source4/heimdal/lib/asn1/gen_copy.c
source4/heimdal/lib/asn1/gen_decode.c
source4/heimdal/lib/asn1/gen_encode.c
source4/heimdal/lib/asn1/gen_free.c
source4/heimdal/lib/asn1/gen_glue.c
source4/heimdal/lib/asn1/gen_length.c
source4/heimdal/lib/asn1/gen_locl.h
source4/heimdal/lib/asn1/gen_seq.c
source4/heimdal/lib/asn1/hash.c
source4/heimdal/lib/asn1/hash.h
source4/heimdal/lib/asn1/k5.asn1
source4/heimdal/lib/asn1/kx509.asn1
source4/heimdal/lib/asn1/lex.c
source4/heimdal/lib/asn1/lex.h
source4/heimdal/lib/asn1/lex.l
source4/heimdal/lib/asn1/main.c
source4/heimdal/lib/asn1/parse.c
source4/heimdal/lib/asn1/parse.h
source4/heimdal/lib/asn1/parse.y
source4/heimdal/lib/asn1/pkcs12.asn1
source4/heimdal/lib/asn1/pkcs8.asn1
source4/heimdal/lib/asn1/pkcs9.asn1
source4/heimdal/lib/asn1/symbol.c
source4/heimdal/lib/asn1/symbol.h
source4/heimdal/lib/asn1/test.asn1
source4/heimdal/lib/asn1/test.gen
source4/heimdal/lib/asn1/timegm.c
source4/heimdal/lib/com_err/com_err.c
source4/heimdal/lib/com_err/com_err.h
source4/heimdal/lib/com_err/com_right.h
source4/heimdal/lib/com_err/compile_et.c
source4/heimdal/lib/com_err/compile_et.h
source4/heimdal/lib/com_err/error.c
source4/heimdal/lib/com_err/lex.c
source4/heimdal/lib/com_err/lex.h
source4/heimdal/lib/com_err/lex.l
source4/heimdal/lib/com_err/parse.c
source4/heimdal/lib/com_err/parse.h
source4/heimdal/lib/com_err/parse.y
source4/heimdal/lib/gssapi/gssapi/gssapi.h
source4/heimdal/lib/gssapi/gssapi/gssapi_krb5.h
source4/heimdal/lib/gssapi/gssapi/gssapi_spnego.h
source4/heimdal/lib/gssapi/krb5/8003.c
source4/heimdal/lib/gssapi/krb5/accept_sec_context.c
source4/heimdal/lib/gssapi/krb5/acquire_cred.c
source4/heimdal/lib/gssapi/krb5/add_cred.c
source4/heimdal/lib/gssapi/krb5/arcfour.c
source4/heimdal/lib/gssapi/krb5/canonicalize_name.c
source4/heimdal/lib/gssapi/krb5/cfx.c
source4/heimdal/lib/gssapi/krb5/cfx.h [changed mode: 0755->0644]
source4/heimdal/lib/gssapi/krb5/compare_name.c
source4/heimdal/lib/gssapi/krb5/compat.c
source4/heimdal/lib/gssapi/krb5/context_time.c
source4/heimdal/lib/gssapi/krb5/copy_ccache.c
source4/heimdal/lib/gssapi/krb5/decapsulate.c
source4/heimdal/lib/gssapi/krb5/delete_sec_context.c
source4/heimdal/lib/gssapi/krb5/display_name.c
source4/heimdal/lib/gssapi/krb5/display_status.c
source4/heimdal/lib/gssapi/krb5/duplicate_name.c
source4/heimdal/lib/gssapi/krb5/encapsulate.c
source4/heimdal/lib/gssapi/krb5/export_name.c
source4/heimdal/lib/gssapi/krb5/export_sec_context.c
source4/heimdal/lib/gssapi/krb5/external.c
source4/heimdal/lib/gssapi/krb5/get_mic.c
source4/heimdal/lib/gssapi/krb5/gkrb5_err.et
source4/heimdal/lib/gssapi/krb5/gsskrb5_locl.h
source4/heimdal/lib/gssapi/krb5/import_name.c
source4/heimdal/lib/gssapi/krb5/import_sec_context.c
source4/heimdal/lib/gssapi/krb5/indicate_mechs.c
source4/heimdal/lib/gssapi/krb5/init.c
source4/heimdal/lib/gssapi/krb5/init_sec_context.c
source4/heimdal/lib/gssapi/krb5/inquire_context.c
source4/heimdal/lib/gssapi/krb5/inquire_cred.c
source4/heimdal/lib/gssapi/krb5/inquire_cred_by_mech.c
source4/heimdal/lib/gssapi/krb5/inquire_cred_by_oid.c
source4/heimdal/lib/gssapi/krb5/inquire_mechs_for_name.c
source4/heimdal/lib/gssapi/krb5/inquire_names_for_mech.c
source4/heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.c
source4/heimdal/lib/gssapi/krb5/prf.c
source4/heimdal/lib/gssapi/krb5/process_context_token.c
source4/heimdal/lib/gssapi/krb5/release_buffer.c
source4/heimdal/lib/gssapi/krb5/release_cred.c
source4/heimdal/lib/gssapi/krb5/release_name.c
source4/heimdal/lib/gssapi/krb5/sequence.c [changed mode: 0755->0644]
source4/heimdal/lib/gssapi/krb5/set_cred_option.c
source4/heimdal/lib/gssapi/krb5/set_sec_context_option.c
source4/heimdal/lib/gssapi/krb5/unwrap.c
source4/heimdal/lib/gssapi/krb5/verify_mic.c
source4/heimdal/lib/gssapi/krb5/wrap.c
source4/heimdal/lib/gssapi/mech/context.c
source4/heimdal/lib/gssapi/mech/context.h
source4/heimdal/lib/gssapi/mech/cred.h
source4/heimdal/lib/gssapi/mech/gss_accept_sec_context.c
source4/heimdal/lib/gssapi/mech/gss_acquire_cred.c
source4/heimdal/lib/gssapi/mech/gss_add_cred.c
source4/heimdal/lib/gssapi/mech/gss_add_oid_set_member.c
source4/heimdal/lib/gssapi/mech/gss_buffer_set.c
source4/heimdal/lib/gssapi/mech/gss_canonicalize_name.c
source4/heimdal/lib/gssapi/mech/gss_compare_name.c
source4/heimdal/lib/gssapi/mech/gss_context_time.c
source4/heimdal/lib/gssapi/mech/gss_create_empty_oid_set.c
source4/heimdal/lib/gssapi/mech/gss_decapsulate_token.c
source4/heimdal/lib/gssapi/mech/gss_delete_sec_context.c
source4/heimdal/lib/gssapi/mech/gss_display_name.c
source4/heimdal/lib/gssapi/mech/gss_display_status.c
source4/heimdal/lib/gssapi/mech/gss_duplicate_name.c
source4/heimdal/lib/gssapi/mech/gss_duplicate_oid.c
source4/heimdal/lib/gssapi/mech/gss_encapsulate_token.c
source4/heimdal/lib/gssapi/mech/gss_export_name.c
source4/heimdal/lib/gssapi/mech/gss_export_sec_context.c
source4/heimdal/lib/gssapi/mech/gss_get_mic.c
source4/heimdal/lib/gssapi/mech/gss_import_name.c
source4/heimdal/lib/gssapi/mech/gss_import_sec_context.c
source4/heimdal/lib/gssapi/mech/gss_indicate_mechs.c
source4/heimdal/lib/gssapi/mech/gss_init_sec_context.c
source4/heimdal/lib/gssapi/mech/gss_inquire_context.c
source4/heimdal/lib/gssapi/mech/gss_inquire_cred.c
source4/heimdal/lib/gssapi/mech/gss_inquire_cred_by_mech.c
source4/heimdal/lib/gssapi/mech/gss_inquire_cred_by_oid.c
source4/heimdal/lib/gssapi/mech/gss_inquire_mechs_for_name.c
source4/heimdal/lib/gssapi/mech/gss_inquire_names_for_mech.c
source4/heimdal/lib/gssapi/mech/gss_inquire_sec_context_by_oid.c
source4/heimdal/lib/gssapi/mech/gss_krb5.c
source4/heimdal/lib/gssapi/mech/gss_mech_switch.c
source4/heimdal/lib/gssapi/mech/gss_names.c
source4/heimdal/lib/gssapi/mech/gss_oid_equal.c
source4/heimdal/lib/gssapi/mech/gss_oid_to_str.c
source4/heimdal/lib/gssapi/mech/gss_process_context_token.c
source4/heimdal/lib/gssapi/mech/gss_pseudo_random.c
source4/heimdal/lib/gssapi/mech/gss_release_buffer.c
source4/heimdal/lib/gssapi/mech/gss_release_cred.c
source4/heimdal/lib/gssapi/mech/gss_release_name.c
source4/heimdal/lib/gssapi/mech/gss_release_oid.c
source4/heimdal/lib/gssapi/mech/gss_release_oid_set.c
source4/heimdal/lib/gssapi/mech/gss_seal.c
source4/heimdal/lib/gssapi/mech/gss_set_cred_option.c
source4/heimdal/lib/gssapi/mech/gss_set_sec_context_option.c
source4/heimdal/lib/gssapi/mech/gss_sign.c
source4/heimdal/lib/gssapi/mech/gss_test_oid_set_member.c
source4/heimdal/lib/gssapi/mech/gss_unseal.c
source4/heimdal/lib/gssapi/mech/gss_unwrap.c
source4/heimdal/lib/gssapi/mech/gss_utils.c
source4/heimdal/lib/gssapi/mech/gss_verify.c
source4/heimdal/lib/gssapi/mech/gss_verify_mic.c
source4/heimdal/lib/gssapi/mech/gss_wrap.c
source4/heimdal/lib/gssapi/mech/gss_wrap_size_limit.c
source4/heimdal/lib/gssapi/mech/gssapi.asn1
source4/heimdal/lib/gssapi/mech/mech_locl.h
source4/heimdal/lib/gssapi/mech/mech_switch.h
source4/heimdal/lib/gssapi/mech/name.h
source4/heimdal/lib/gssapi/mech/utils.h
source4/heimdal/lib/gssapi/spnego/accept_sec_context.c
source4/heimdal/lib/gssapi/spnego/compat.c
source4/heimdal/lib/gssapi/spnego/context_stubs.c
source4/heimdal/lib/gssapi/spnego/cred_stubs.c
source4/heimdal/lib/gssapi/spnego/external.c
source4/heimdal/lib/gssapi/spnego/init_sec_context.c
source4/heimdal/lib/gssapi/spnego/spnego.asn1
source4/heimdal/lib/gssapi/spnego/spnego_locl.h
source4/heimdal/lib/hcrypto/aes.c
source4/heimdal/lib/hcrypto/aes.h
source4/heimdal/lib/hcrypto/bn.c
source4/heimdal/lib/hcrypto/bn.h
source4/heimdal/lib/hcrypto/des.c
source4/heimdal/lib/hcrypto/des.h
source4/heimdal/lib/hcrypto/dh-imath.c
source4/heimdal/lib/hcrypto/dh.c
source4/heimdal/lib/hcrypto/dh.h
source4/heimdal/lib/hcrypto/dsa.c
source4/heimdal/lib/hcrypto/dsa.h
source4/heimdal/lib/hcrypto/engine.c
source4/heimdal/lib/hcrypto/engine.h
source4/heimdal/lib/hcrypto/evp.c
source4/heimdal/lib/hcrypto/evp.h
source4/heimdal/lib/hcrypto/hash.h
source4/heimdal/lib/hcrypto/hmac.h
source4/heimdal/lib/hcrypto/imath/LICENSE
source4/heimdal/lib/hcrypto/imath/imath.c [changed mode: 0755->0644]
source4/heimdal/lib/hcrypto/imath/imath.h [changed mode: 0755->0644]
source4/heimdal/lib/hcrypto/imath/iprime.c [changed mode: 0755->0644]
source4/heimdal/lib/hcrypto/imath/iprime.h [changed mode: 0755->0644]
source4/heimdal/lib/hcrypto/md2.c
source4/heimdal/lib/hcrypto/md2.h
source4/heimdal/lib/hcrypto/md4.c
source4/heimdal/lib/hcrypto/md4.h
source4/heimdal/lib/hcrypto/md5.c
source4/heimdal/lib/hcrypto/md5.h
source4/heimdal/lib/hcrypto/pkcs12.c
source4/heimdal/lib/hcrypto/pkcs12.h
source4/heimdal/lib/hcrypto/pkcs5.c
source4/heimdal/lib/hcrypto/rand-egd.c
source4/heimdal/lib/hcrypto/rand-fortuna.c
source4/heimdal/lib/hcrypto/rand-unix.c
source4/heimdal/lib/hcrypto/rand.c
source4/heimdal/lib/hcrypto/rand.h
source4/heimdal/lib/hcrypto/randi.h
source4/heimdal/lib/hcrypto/rc2.c
source4/heimdal/lib/hcrypto/rc2.h
source4/heimdal/lib/hcrypto/rc4.c
source4/heimdal/lib/hcrypto/rc4.h
source4/heimdal/lib/hcrypto/rijndael-alg-fst.c
source4/heimdal/lib/hcrypto/rnd_keys.c
source4/heimdal/lib/hcrypto/rsa-imath.c
source4/heimdal/lib/hcrypto/rsa.c
source4/heimdal/lib/hcrypto/rsa.h
source4/heimdal/lib/hcrypto/sha.c
source4/heimdal/lib/hcrypto/sha.h
source4/heimdal/lib/hcrypto/sha256.c
source4/heimdal/lib/hcrypto/ui.c
source4/heimdal/lib/hcrypto/ui.h
source4/heimdal/lib/hdb/db.c
source4/heimdal/lib/hdb/dbinfo.c
source4/heimdal/lib/hdb/ext.c
source4/heimdal/lib/hdb/hdb.asn1
source4/heimdal/lib/hdb/hdb.c
source4/heimdal/lib/hdb/hdb.h
source4/heimdal/lib/hdb/hdb_err.et
source4/heimdal/lib/hdb/hdb_locl.h
source4/heimdal/lib/hdb/keys.c
source4/heimdal/lib/hdb/keytab.c
source4/heimdal/lib/hdb/mkey.c
source4/heimdal/lib/hdb/ndbm.c
source4/heimdal/lib/hx509/ca.c
source4/heimdal/lib/hx509/cert.c
source4/heimdal/lib/hx509/cms.c
source4/heimdal/lib/hx509/collector.c
source4/heimdal/lib/hx509/crmf.asn1
source4/heimdal/lib/hx509/crypto.c
source4/heimdal/lib/hx509/env.c
source4/heimdal/lib/hx509/error.c
source4/heimdal/lib/hx509/hx509.h
source4/heimdal/lib/hx509/hx509_err.et
source4/heimdal/lib/hx509/hx_locl.h
source4/heimdal/lib/hx509/keyset.c
source4/heimdal/lib/hx509/ks_dir.c
source4/heimdal/lib/hx509/ks_file.c
source4/heimdal/lib/hx509/ks_keychain.c
source4/heimdal/lib/hx509/ks_mem.c
source4/heimdal/lib/hx509/ks_null.c
source4/heimdal/lib/hx509/ks_p11.c
source4/heimdal/lib/hx509/ks_p12.c
source4/heimdal/lib/hx509/lock.c
source4/heimdal/lib/hx509/name.c
source4/heimdal/lib/hx509/ocsp.asn1
source4/heimdal/lib/hx509/peer.c
source4/heimdal/lib/hx509/pkcs10.asn1
source4/heimdal/lib/hx509/print.c
source4/heimdal/lib/hx509/req.c
source4/heimdal/lib/hx509/revoke.c
source4/heimdal/lib/hx509/test_name.c
source4/heimdal/lib/krb5/acache.c
source4/heimdal/lib/krb5/add_et_list.c
source4/heimdal/lib/krb5/addr_families.c
source4/heimdal/lib/krb5/appdefault.c
source4/heimdal/lib/krb5/asn1_glue.c
source4/heimdal/lib/krb5/auth_context.c
source4/heimdal/lib/krb5/build_ap_req.c
source4/heimdal/lib/krb5/build_auth.c
source4/heimdal/lib/krb5/cache.c
source4/heimdal/lib/krb5/changepw.c
source4/heimdal/lib/krb5/codec.c
source4/heimdal/lib/krb5/config_file.c
source4/heimdal/lib/krb5/config_file_netinfo.c
source4/heimdal/lib/krb5/constants.c
source4/heimdal/lib/krb5/context.c
source4/heimdal/lib/krb5/convert_creds.c
source4/heimdal/lib/krb5/copy_host_realm.c
source4/heimdal/lib/krb5/crc.c
source4/heimdal/lib/krb5/creds.c
source4/heimdal/lib/krb5/crypto.c
source4/heimdal/lib/krb5/data.c
source4/heimdal/lib/krb5/eai_to_heim_errno.c
source4/heimdal/lib/krb5/error_string.c
source4/heimdal/lib/krb5/expand_hostname.c
source4/heimdal/lib/krb5/fcache.c
source4/heimdal/lib/krb5/free.c
source4/heimdal/lib/krb5/free_host_realm.c
source4/heimdal/lib/krb5/generate_seq_number.c
source4/heimdal/lib/krb5/generate_subkey.c
source4/heimdal/lib/krb5/get_cred.c
source4/heimdal/lib/krb5/get_default_principal.c
source4/heimdal/lib/krb5/get_default_realm.c
source4/heimdal/lib/krb5/get_for_creds.c
source4/heimdal/lib/krb5/get_host_realm.c
source4/heimdal/lib/krb5/get_in_tkt.c
source4/heimdal/lib/krb5/get_in_tkt_with_keytab.c
source4/heimdal/lib/krb5/get_port.c
source4/heimdal/lib/krb5/heim_err.et
source4/heimdal/lib/krb5/heim_threads.h [changed mode: 0755->0644]
source4/heimdal/lib/krb5/init_creds.c
source4/heimdal/lib/krb5/init_creds_pw.c
source4/heimdal/lib/krb5/k524_err.et
source4/heimdal/lib/krb5/kcm.c
source4/heimdal/lib/krb5/keyblock.c
source4/heimdal/lib/krb5/keytab.c
source4/heimdal/lib/krb5/keytab_any.c
source4/heimdal/lib/krb5/keytab_file.c
source4/heimdal/lib/krb5/keytab_keyfile.c
source4/heimdal/lib/krb5/keytab_memory.c
source4/heimdal/lib/krb5/krb5-v4compat.h
source4/heimdal/lib/krb5/krb5.h
source4/heimdal/lib/krb5/krb5_ccapi.h
source4/heimdal/lib/krb5/krb5_err.et
source4/heimdal/lib/krb5/krb5_locl.h
source4/heimdal/lib/krb5/krbhst.c
source4/heimdal/lib/krb5/locate_plugin.h
source4/heimdal/lib/krb5/log.c
source4/heimdal/lib/krb5/mcache.c
source4/heimdal/lib/krb5/misc.c
source4/heimdal/lib/krb5/mit_glue.c [changed mode: 0755->0644]
source4/heimdal/lib/krb5/mk_error.c
source4/heimdal/lib/krb5/mk_priv.c
source4/heimdal/lib/krb5/mk_rep.c
source4/heimdal/lib/krb5/mk_req.c
source4/heimdal/lib/krb5/mk_req_ext.c
source4/heimdal/lib/krb5/n-fold.c
source4/heimdal/lib/krb5/pac.c
source4/heimdal/lib/krb5/padata.c
source4/heimdal/lib/krb5/pkinit.c [changed mode: 0755->0644]
source4/heimdal/lib/krb5/plugin.c
source4/heimdal/lib/krb5/principal.c
source4/heimdal/lib/krb5/prompter_posix.c
source4/heimdal/lib/krb5/rd_cred.c
source4/heimdal/lib/krb5/rd_error.c
source4/heimdal/lib/krb5/rd_priv.c
source4/heimdal/lib/krb5/rd_rep.c
source4/heimdal/lib/krb5/rd_req.c
source4/heimdal/lib/krb5/replay.c
source4/heimdal/lib/krb5/send_to_kdc.c
source4/heimdal/lib/krb5/set_default_realm.c
source4/heimdal/lib/krb5/store.c
source4/heimdal/lib/krb5/store_emem.c
source4/heimdal/lib/krb5/store_fd.c
source4/heimdal/lib/krb5/store_mem.c
source4/heimdal/lib/krb5/ticket.c
source4/heimdal/lib/krb5/time.c
source4/heimdal/lib/krb5/transited.c
source4/heimdal/lib/krb5/v4_glue.c
source4/heimdal/lib/krb5/version.c
source4/heimdal/lib/krb5/warn.c
source4/heimdal/lib/ntlm/heimntlm.h
source4/heimdal/lib/ntlm/ntlm.c
source4/heimdal/lib/roken/base64.c
source4/heimdal/lib/roken/base64.h
source4/heimdal/lib/roken/bswap.c
source4/heimdal/lib/roken/cloexec.c
source4/heimdal/lib/roken/closefrom.c
source4/heimdal/lib/roken/copyhostent.c
source4/heimdal/lib/roken/dumpdata.c
source4/heimdal/lib/roken/ecalloc.c
source4/heimdal/lib/roken/emalloc.c
source4/heimdal/lib/roken/erealloc.c
source4/heimdal/lib/roken/err.hin
source4/heimdal/lib/roken/estrdup.c
source4/heimdal/lib/roken/freeaddrinfo.c
source4/heimdal/lib/roken/freehostent.c
source4/heimdal/lib/roken/gai_strerror.c
source4/heimdal/lib/roken/get_window_size.c
source4/heimdal/lib/roken/getaddrinfo.c
source4/heimdal/lib/roken/getarg.c
source4/heimdal/lib/roken/getarg.h
source4/heimdal/lib/roken/getipnodebyaddr.c
source4/heimdal/lib/roken/getipnodebyname.c
source4/heimdal/lib/roken/getnameinfo.c
source4/heimdal/lib/roken/getprogname.c
source4/heimdal/lib/roken/h_errno.c
source4/heimdal/lib/roken/hex.c
source4/heimdal/lib/roken/hex.h
source4/heimdal/lib/roken/hostent_find_fqdn.c
source4/heimdal/lib/roken/inet_aton.c
source4/heimdal/lib/roken/inet_ntop.c
source4/heimdal/lib/roken/inet_pton.c
source4/heimdal/lib/roken/issuid.c
source4/heimdal/lib/roken/net_read.c
source4/heimdal/lib/roken/net_write.c
source4/heimdal/lib/roken/parse_bytes.h
source4/heimdal/lib/roken/parse_time.c
source4/heimdal/lib/roken/parse_time.h
source4/heimdal/lib/roken/parse_units.c
source4/heimdal/lib/roken/parse_units.h
source4/heimdal/lib/roken/resolve.c
source4/heimdal/lib/roken/resolve.h
source4/heimdal/lib/roken/roken-common.h
source4/heimdal/lib/roken/roken.h.in
source4/heimdal/lib/roken/roken_gethostby.c
source4/heimdal/lib/roken/rtbl.c
source4/heimdal/lib/roken/rtbl.h
source4/heimdal/lib/roken/setprogname.c
source4/heimdal/lib/roken/signal.c
source4/heimdal/lib/roken/simple_exec.c
source4/heimdal/lib/roken/socket.c
source4/heimdal/lib/roken/strcollect.c
source4/heimdal/lib/roken/strlwr.c
source4/heimdal/lib/roken/strpool.c
source4/heimdal/lib/roken/strsep.c
source4/heimdal/lib/roken/strsep_copy.c
source4/heimdal/lib/roken/strupr.c
source4/heimdal/lib/roken/vis.c
source4/heimdal/lib/roken/vis.hin
source4/heimdal/lib/roken/xfree.c
source4/heimdal/lib/vers/print_version.c
source4/heimdal/lib/wind/UnicodeData.py
source4/heimdal/lib/wind/gen-bidi.py
source4/heimdal/lib/wind/gen-combining.py
source4/heimdal/lib/wind/gen-errorlist.py
source4/heimdal/lib/wind/gen-map.py
source4/heimdal/lib/wind/gen-normalize.py
source4/heimdal/lib/wind/generate.py
source4/heimdal/lib/wind/map.c
source4/heimdal/lib/wind/normalize.c
source4/heimdal/lib/wind/rfc3454.py
source4/heimdal/lib/wind/rfc4518.py
source4/heimdal/lib/wind/stringprep.c
source4/heimdal/lib/wind/stringprep.py
source4/heimdal/lib/wind/utf8.c
source4/heimdal/lib/wind/util.py
source4/heimdal/lib/wind/wind.h
source4/heimdal/lib/wind/wind_err.et
source4/heimdal/lib/wind/windlocl.h

index 88ab7fd12135aef1117c8534cef0c3a36d8787ef..3b938248fcb7c159523686182682d5b66263db41 100644 (file)
@@ -1,4 +1,4 @@
-$Id: README 8839 2000-07-27 02:33:54Z assar $
+$Id$
 
 Heimdal is a Kerberos 5 implementation.
 
@@ -10,7 +10,7 @@ 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:
+<http://www.h5l.org/> or the mailing lists:
 
 heimdal-announce@sics.se       low-volume announcement
 heimdal-discuss@sics.se                high-volume discussion
index 1e6846593b0896eb33bc138702a3eae0181bd986..f81f3524c15931415b84d191b537b8613e802575 100644 (file)
@@ -1,4 +1,4 @@
-dnl $Id: check-var.m4 15422 2005-06-16 18:59:29Z lha $
+dnl $Id$
 dnl
 dnl rk_CHECK_VAR(variable, includes)
 AC_DEFUN([rk_CHECK_VAR], [
index 76965a84ee8aa7942f0c8b8fa5d81327cd6a1f8e..f3413409f63c2511528c3a689fc0587d8140886c 100644 (file)
@@ -1,4 +1,4 @@
-dnl $Id: find-func-no-libs.m4 13338 2004-02-12 14:21:14Z lha $
+dnl $Id$
 dnl
 dnl
 dnl Look for function in any of the specified libraries
index 617a09e8da1b8f7d10ca13d7f6570d91e4629442..692001c103b712853151666ad6abdf15caaf72ca 100644 (file)
@@ -1,4 +1,4 @@
-dnl $Id: find-func-no-libs2.m4 14166 2004-08-26 12:35:42Z joda $
+dnl $Id$
 dnl
 dnl
 dnl Look for function in any of the specified libraries
index 2354f38e5e4bb6fe95fb6c7dbb54046e7564c9c7..865772a70085d2009ff1f0f9562c7787da17be89 100644 (file)
@@ -1,4 +1,4 @@
-dnl $Id: find-func.m4 13338 2004-02-12 14:21:14Z lha $
+dnl $Id$
 dnl
 dnl AC_FIND_FUNC(func, libraries, includes, arguments)
 AC_DEFUN([AC_FIND_FUNC], [
index 8c7b54ae78464d0618b4ad6b54c0640f3bef67c2..b89ef790670b4b7fce0e306bc689e1359b4fd748 100644 (file)
@@ -1,5 +1,5 @@
 # Make prototypes from .c files
-# $Id: make-proto.pl 23023 2008-04-17 10:01:46Z lha $
+# $Id$
 
 ##use Getopt::Std;
 require 'getopts.pl';
index 8bb5e4ecbb0f8752b7b32be7123386d875a729b4..b4045094d8026522e0dee0671f66379eb44ed372 100644 (file)
@@ -1,6 +1,6 @@
 dnl stuff used by DNS resolv code in roken
 dnl
-dnl $Id: resolv.m4 16009 2005-09-02 10:17:38Z lha $
+dnl $Id$
 dnl
 
 AC_DEFUN([rk_RESOLV],[
index 3e4ad292537b4622577bd61f11e9c21940fdbde0..a46c9175b0b6a6500e37cbe306b383d97b45ac8e 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: 524.c 18270 2006-10-06 17:06:30Z lha $");
+RCSID("$Id$");
 
 #include <krb5-v4compat.h>
 
index 33a2c297fa11fc9891f726e54847035ae82d3a9e..87952ca6eb2aba49f440c5f95d140d28403f8b30 100644 (file)
@@ -36,7 +36,7 @@
 #include <getarg.h>
 #include <parse_bytes.h>
 
-RCSID("$Id: default_config.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 krb5_error_code
 krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config)
index bf1e45b328a17e188da00f595400c212570cf616..401ca1db1143a790cdfbd43b7eb0b8b524e8e7f9 100644 (file)
@@ -34,7 +34,7 @@
 #include "kdc_locl.h"
 #include <hex.h>
 
-RCSID("$Id: digest.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 #define MS_CHAP_V2     0x20
 #define CHAP_MD5       0x10
index 64f6b6e438cb60e3555df677b8ada4042249ea0c..c2bd4c5b4f30825e644f3baf52588c8ee67a42ba 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 /* 
- * $Id: headers.h 19658 2007-01-04 00:15:34Z lha 
+ * $Id$ 
  */
 
 #ifndef __HEADERS_H__
index 4f257d717ee35b1162d9f3817113087e963b3feb..8f3c3e02ea83981f2c53a47ea4db42c7a3f70610 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: kaserver.c 23110 2008-04-27 18:51:17Z lha $");
+RCSID("$Id$");
 
 #include <krb5-v4compat.h>
 #include <rx.h>
index 6c129f38f520bb99a70c74f4acbb702675deb34e..f0edae721f52ff440eb1751b47dc90cbd4c814c7 100644 (file)
@@ -35,7 +35,7 @@
  */
 
 /* 
- * $Id: kdc.h 21287 2007-06-25 14:09:03Z lha 
+ * $Id$ 
  */
 
 #ifndef __KDC_H__
index fe0523665a4dbf983b299ecfbbcdffb095becb4b..6ce4a9f40f4979bcb8dfc94211a140eede86445f 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 /* 
- * $Id: kdc_locl.h 22247 2007-12-08 23:49:41Z lha 
+ * $Id$ 
  */
 
 #ifndef __KDC_LOCL_H__
index cbba64945b3e495ce885af2376c3d81aba519dc3..3e9a70057e4df243aa46684ea77cc7ea02353b77 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <krb5-v4compat.h>
 
-RCSID("$Id: kerberos4.c 21577 2007-07-16 08:14:06Z lha $");
+RCSID("$Id$");
 
 #ifndef swap32
 static uint32_t
@@ -134,7 +134,7 @@ _kdc_do_version4(krb5_context context,
                 struct sockaddr_in *addr)
 {
     krb5_storage *sp;
-    krb5_error_code ret;
+    krb5_error_code ret = EINVAL;
     hdb_entry_ex *client = NULL, *server = NULL;
     Key *ckey, *skey;
     int8_t pvno;
@@ -162,6 +162,7 @@ _kdc_do_version4(krb5_context context,
        kdc_log(context, config, 0,
                "Protocol version mismatch (krb4) (%d)", pvno);
        make_err_reply(context, reply, KRB4ET_KDC_PKT_VER, "protocol mismatch");
+       ret = KRB4ET_KDC_PKT_VER;
        goto out;
     }
     RCHECK(krb5_ret_int8(sp, &msg_type), out);
@@ -258,20 +259,6 @@ _kdc_do_version4(krb5_context context,
            goto out1;
        }
 
-#if 0
-       /* this is not necessary with the new code in libkrb */
-       /* find a properly salted key */
-       while(ckey->salt == NULL || ckey->salt->salt.length != 0)
-           ret = hdb_next_keytype2key(context, &client->entry, KEYTYPE_DES, &ckey);
-       if(ret){
-           kdc_log(context, config, 0, "No version-4 salted key in database -- %s.%s@%s", 
-                   name, inst, realm);
-           make_err_reply(context, reply, KRB4ET_KDC_NULL_KEY, 
-                          "No version-4 salted key in database");
-           goto out1;
-       }
-#endif
-       
        ret = _kdc_get_des_key(context, server, TRUE, FALSE, &skey);
        if(ret){
            kdc_log(context, config, 0, "no suitable DES key for server");
@@ -624,12 +611,14 @@ _kdc_do_version4(krb5_context context,
        break;
     }
     case AUTH_MSG_ERR_REPLY:
+       ret = EINVAL;
        break;
     default:
        kdc_log(context, config, 0, "Unknown message type (krb4): %d from %s", 
                msg_type, from);
        
        make_err_reply(context, reply, KFAILURE, "Unknown message type");
+       ret = EINVAL;
     }
  out:
     if(name)
@@ -647,7 +636,7 @@ _kdc_do_version4(krb5_context context,
     if(server)
        _kdc_free_ent(context, server);
     krb5_storage_free(sp);
-    return 0;
+    return ret;
 }
 
 krb5_error_code
index 2a2c48c233a657d3138b29b37865e2a05155e6b8..7930ef42e482bf57d52c6e8aab965565250e38e9 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: kerberos5.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 #define MAX_TIME ((time_t)((1U << 31) - 1))
 
@@ -84,6 +84,24 @@ _kdc_find_padata(const KDC_REQ *req, int *start, int type)
     return NULL;
 }
 
+/*
+ * This is a hack to allow predefined weak services, like afs to
+ * still use weak types
+ */
+
+krb5_boolean
+_kdc_is_weak_expection(krb5_principal principal, krb5_enctype etype)
+{
+    if (principal->name.name_string.len > 0 &&
+       strcmp(principal->name.name_string.val[0], "afs") == 0 &&
+       (etype == ETYPE_DES_CBC_CRC
+        || etype == ETYPE_DES_CBC_MD4
+        || etype == ETYPE_DES_CBC_MD5))
+       return TRUE;
+    return FALSE;
+}
+
+
 /*
  * Detect if `key' is the using the the precomputed `default_salt'.
  */
@@ -120,7 +138,8 @@ _kdc_find_etype(krb5_context context, const hdb_entry_ex *princ,
     for(i = 0; ret != 0 && i < len ; i++) {
        Key *key = NULL;
 
-       if (krb5_enctype_valid(context, etypes[i]) != 0)
+       if (krb5_enctype_valid(context, etypes[i]) != 0 &&
+           !_kdc_is_weak_expection(princ->entry.principal, etypes[i]))
            continue;
 
        while (hdb_next_enctype2key(context, &princ->entry, etypes[i], &key) == 0) {
index 071a30d5a78a674d1ce126683f4dc5e3185c7615..19dff5e01df3347d5070eda3bbe221f1d463bed3 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: krb5tgs.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 /*
  * return the realm of a krbtgt-ticket or NULL
@@ -662,6 +662,7 @@ tgs_make_reply(krb5_context context,
               krb5_kvno kvno,
               AuthorizationData *auth_data,
               hdb_entry_ex *server,
+              krb5_principal server_principal,
               const char *server_name,
               hdb_entry_ex *client,
               krb5_principal client_principal,
@@ -678,6 +679,7 @@ tgs_make_reply(krb5_context context,
     EncTicketPart et;
     KDCOptions f = b->kdc_options;
     krb5_error_code ret;
+    int is_weak = 0;
 
     memset(&rep, 0, sizeof(rep));
     memset(&et, 0, sizeof(et));
@@ -729,9 +731,9 @@ tgs_make_reply(krb5_context context,
     if(ret)
        goto out;
 
-    copy_Realm(krb5_princ_realm(context, server->entry.principal),
+    copy_Realm(krb5_princ_realm(context, server_principal),
               &rep.ticket.realm);
-    _krb5_principal2principalname(&rep.ticket.sname, server->entry.principal);
+    _krb5_principal2principalname(&rep.ticket.sname, server_principal);
     copy_Realm(&tgt_name->realm, &rep.crealm);
 /*
     if (f.request_anonymous)
@@ -885,6 +887,14 @@ tgs_make_reply(krb5_context context,
            goto out;
     }
 
+    if (krb5_enctype_valid(context, et.key.keytype) != 0
+       && _kdc_is_weak_expection(server->entry.principal, et.key.keytype)) 
+    {
+       krb5_enctype_enable(context, et.key.keytype);
+       is_weak = 1;
+    }
+
+
     /* It is somewhat unclear where the etype in the following
        encryption should come from. What we have is a session
        key in the passed tgt, and a list of preferred etypes
@@ -899,6 +909,9 @@ tgs_make_reply(krb5_context context,
                            &rep, &et, &ek, et.key.keytype,
                            kvno,
                            serverkey, 0, &tgt->key, e_text, reply);
+    if (is_weak)
+       krb5_enctype_disable(context, et.key.keytype);
+
 out:
     free_TGS_REP(&rep);
     free_TransitedEncoding(&et.transited);
@@ -1462,7 +1475,8 @@ tgs_build_reply(krb5_context context,
      */
 
 server_lookup:
-    ret = _kdc_db_fetch(context, config, sp, HDB_F_GET_SERVER, NULL, &server);
+    ret = _kdc_db_fetch(context, config, sp, HDB_F_GET_SERVER | HDB_F_CANON,
+                       NULL, &server);
 
     if(ret){
        const char *new_rlm;
@@ -1521,7 +1535,8 @@ server_lookup:
        goto out;
     }
 
-    ret = _kdc_db_fetch(context, config, cp, HDB_F_GET_CLIENT, NULL, &client);
+    ret = _kdc_db_fetch(context, config, cp, HDB_F_GET_CLIENT | HDB_F_CANON,
+                       NULL, &client);
     if(ret) {
        const char *krbtgt_realm;
 
@@ -1927,6 +1942,7 @@ server_lookup:
                         kvno,
                         *auth_data,
                         server,
+                        sp,
                         spn,
                         client,
                         cp,
index 8f117cebc0507b03d0b46ef07d10c1f288b5c666..33991d19077bd38e81a9ed46df4bf0e99f50c21c 100644 (file)
@@ -36,7 +36,7 @@
 #include <rfc2459_asn1.h>
 #include <hx509.h>
 
-RCSID("$Id: kx509.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 /*
  *
index 8cf967fbfb8b179da9055e96c8e9df0e2c359bc4..98b25b92dba7b9ab6f15e4999c304a0b345d8edd 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 #include "kdc_locl.h"
-RCSID("$Id: log.c 22254 2007-12-09 06:01:05Z lha $");
+RCSID("$Id$");
 
 void
 kdc_openlog(krb5_context context, 
index 528b9e6a3b674220731463f2a9fc0d13332177b6..0c64dd568eb9ffa69fcb94678f277ea89a1cba54 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: misc.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 struct timeval _kdc_now;
 
old mode 100755 (executable)
new mode 100644 (file)
index 9f6d57f..57767c4
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: pkinit.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 #ifdef PKINIT
 
index 550bfb04b2a15db05f3ede316cb7c3325d01de00..1a0c7c72ce6550b689449d9c2636eae3fd963342 100644 (file)
@@ -34,7 +34,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: process.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 /*
  *
@@ -100,9 +100,9 @@ krb5_kdc_process_request(krb5_context context,
        return ret;
     } else if(_kdc_maybe_version4(buf, len)){
        *prependlength = FALSE; /* elbitapmoc sdrawkcab XXX */
-       _kdc_do_version4(context, config, buf, len, reply, from, 
-                        (struct sockaddr_in*)addr);
-       return 0;
+       ret = _kdc_do_version4(context, config, buf, len, reply, from, 
+                              (struct sockaddr_in*)addr);
+       return ret;
     } else if (config->enable_kaserver) {
        ret = _kdc_do_kaserver(context, config, buf, len, reply, from,
                               (struct sockaddr_in*)addr);
index 18806d79dae694a4371b899a78743440e7ba6d70..a84e5ec5f54fa26319d6f1bc1f16cb14ebe9d704 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: rx.h 17447 2006-05-05 10:52:01Z lha $ */
+/* $Id$ */
 
 #ifndef __RX_H__
 #define __RX_H__
index 621757f6dcf972c493c6517a9c3a68ab9fe404b8..e057a3e6fbae8dd326141a2bc8d1cf68203df808 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "kdc_locl.h"
 
-RCSID("$Id: windc.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 static krb5plugin_windc_ftable *windcft;
 static void *windcctx;
index 44aab9e22b7ada10492764af98628350548fed9f..3780258ad03ff2624547921a05d0a1949e229173 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: windc_plugin.h 22693 2008-03-19 08:57:49Z lha $ */
+/* $Id$ */
 
 #ifndef HEIMDAL_KRB5_PAC_PLUGIN_H
 #define HEIMDAL_KRB5_PAC_PLUGIN_H 1
index 0e03dc4d377e7588206d243fc156d01d583a2ec6..7880c9e010cbdf37ed19476010e6240e360587e6 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 #include "kuser_locl.h"
-RCSID("$Id: kinit.c 23418 2008-07-26 18:36:48Z lha $");
+RCSID("$Id$");
 
 #include "krb5-v4compat.h"
 
@@ -67,6 +67,7 @@ char *pk_x509_anchors = NULL;
 int pk_use_enckey      = 0;
 static int canonicalize_flag = 0;
 static int ok_as_delegate_flag = 0;
+static int use_referrals_flag = 0;
 static int windows_flag = 0;
 static char *ntlm_domain;
 
@@ -166,6 +167,9 @@ static struct getargs args[] = {
     { "ok-as-delegate",        0,  arg_flag, &ok_as_delegate_flag,
       "honor ok-as-delegate on tickets" },
 
+    { "use-referrals", 0,  arg_flag, &use_referrals_flag,
+      "only use referrals, no dns canalisation" },
+
     { "windows",       0,  arg_flag, &windows_flag,
       "get windows behavior" },
 
@@ -597,11 +601,17 @@ get_new_tickets(krb5_context context,
     if (ntlm_domain && ntlmkey.data)
        store_ntlmkey(context, ccache, ntlm_domain, &ntlmkey);
 
-    if (ok_as_delegate_flag || windows_flag) {
+    if (ok_as_delegate_flag || windows_flag || use_referrals_flag) {
+       unsigned char d = 0;
        krb5_data data;
 
+       if (ok_as_delegate_flag || windows_flag)
+           d |= 1;
+       if (use_referrals_flag || windows_flag)
+           d |= 2;
+
        data.length = 1;
-       data.data = "\x01";
+       data.data = &d;
 
        krb5_cc_set_config(context, ccache, NULL, "realm-config", &data);
     }
index 36ea01a9a59f391e30596eff2025c0ef787ba52d..ad48a0c99c551cc7b9269d71530b3b7fd1413803 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: kuser_locl.h 20458 2007-04-19 20:41:27Z lha $ */
+/* $Id$ */
 
 #ifndef __KUSER_LOCL_H__
 #define __KUSER_LOCL_H__
index 685f0b1898313f9d03399a949590c499468058d7..65a467521d798808a789740ae1123446300e9939 100644 (file)
@@ -1,5 +1,5 @@
 -- From RFC 3369 --
--- $Id: CMS.asn1 18054 2006-09-07 12:20:42Z lha $ --
+-- $Id$ --
 
 CMS DEFINITIONS ::= BEGIN
 
index 5789e0f22dfbb03c3a4bb7c83ae5690dda7acdb7..4c6af8b45eb1717316d477b04cdc1244cacfbd5b 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: asn1-common.h 22429 2008-01-13 10:25:50Z lha $ */
+/* $Id$ */
 
 #include <stddef.h>
 #include <time.h>
index c624e218e7ccad82bd4577b11e437f1d115d93e2..26bda55c1900656ff985742544ced2d9b1eed666 100644 (file)
@@ -3,7 +3,7 @@
 #
 # This might look like a com_err file, but is not
 #
-id "$Id: asn1_err.et 21394 2007-07-02 10:14:43Z lha $"
+id "$Id$"
 
 error_table asn1
 prefix ASN1
index 65b382e6daf0bf3eabcaf50c8bf942cde819246f..50eb598c22fd5d065923f1257ed34823b69f4e5f 100644 (file)
@@ -40,7 +40,7 @@
 #include <hex.h>
 #include <err.h>
 
-RCSID("$Id: asn1_gen.c 16666 2006-01-30 15:06:03Z lha $");
+RCSID("$Id$");
 
 static int
 doit(const char *fn)
index 3659b3859d0d0a77c60b79e37587140cfdf13f1b..73eb50f8b8256553f46f4283df23eaa15d2ef053 100644 (file)
@@ -1,5 +1,5 @@
 /*     $NetBSD: queue.h,v 1.38 2004/04/18 14:12:05 lukem Exp $ */
-/*     $Id: asn1_queue.h 15617 2005-07-12 06:27:42Z lha $ */
+/*     $Id$ */
 
 /*
  * Copyright (c) 1991, 1993
index 5ba3e3880c2e23a5fae1aa90140073ce5e3fd370..5c2690f9b68a17ba15657c1febe84883e26bb686 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: canthandle.asn1 22071 2007-11-14 20:04:50Z lha $ --
+-- $Id$ --
 
 CANTHANDLE DEFINITIONS ::= BEGIN
 
index 120dc086afc9383c9e19b4386120bbc2c9492148..159d358fcbd78111c294bdde4207a98baf84e7fa 100644 (file)
@@ -38,7 +38,7 @@
 #include <getarg.h>
 #include <err.h>
 
-RCSID("$Id: der.c 22429 2008-01-13 10:25:50Z lha $");
+RCSID("$Id$");
 
 
 static const char *class_names[] = {
index 0484137192c47a24e363cf062bbe083b5bb80f04..cef92aa07f2d27bb003cf347f03642fe495b523d 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: der.h 23183 2008-05-22 09:56:51Z lha $ */
+/* $Id$ */
 
 #ifndef __DER_H__
 #define __DER_H__
old mode 100755 (executable)
new mode 100644 (file)
index 04c4531ca5782224b2a25d638ebe13d1745b0aa9..ba1aa36c02180f246bf73eab7856a50ce706101b 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "der_locl.h"
 
-RCSID("$Id: der_copy.c 19539 2006-12-28 17:15:05Z lha $");
+RCSID("$Id$");
 
 int
 der_copy_general_string (const heim_general_string *from, 
index 6908bddcc26ea7e40101130bb9bea3efdca7b64b..37e5bd7f279f69aa33189b241227c8777423fa05 100644 (file)
@@ -34,7 +34,7 @@
 #include "der_locl.h"
 #include <hex.h>
 
-RCSID("$Id: der_format.c 20861 2007-06-03 20:18:29Z lha $");
+RCSID("$Id$");
 
 int
 der_parse_hex_heim_integer (const char *p, heim_integer *data)
index f59ec72eb7f5c0040af819f61bbc595178fa5405..8658dc7d15f0a836b3b06ba858a5fab9da62b6bc 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "der_locl.h"
 
-RCSID("$Id: der_free.c 23182 2008-05-22 02:59:04Z lha $");
+RCSID("$Id$");
 
 void
 der_free_general_string (heim_general_string *str)
index f232ce9a296dc880f89b43ae57d1ade825698e4c..297823f8f03d77fafc3bd1e4629390371e7e9af1 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "der_locl.h"
 
-RCSID("$Id: der_get.c 21369 2007-06-27 10:14:39Z lha $");
+RCSID("$Id$");
 
 #include <version.h>
 
index a7f8f593a20e115aa692376af9eca8665838fb9a..f0091bd50b20dffd6add80015d71fa71864fd966 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "der_locl.h"
 
-RCSID("$Id: der_length.c 19539 2006-12-28 17:15:05Z lha $");
+RCSID("$Id$");
 
 size_t
 _heim_len_unsigned (unsigned val)
index 5b97557d74a3c5cced0691ef87613c70324975c4..cdcb5c09a568c441442da63e571c3e19027ef3ac 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: der_locl.h 18608 2006-10-19 16:24:02Z lha $ */
+/* $Id$ */
 
 #ifndef __DER_LOCL_H__
 #define __DER_LOCL_H__
index 1fdbfe1305d6df8562e62cdd50d0142bba21c482..54fc0cb5f86b298ca99f4042d67804fd480f0cd2 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "der_locl.h"
 
-RCSID("$Id: der_put.c 19539 2006-12-28 17:15:05Z lha $");
+RCSID("$Id$");
 
 /*
  * All encoding functions take a pointer `p' to first position in
index eafe48ea5aee1e57bfa361863494e6f976429fe9..1cf58b46380feef3bd458f1f33a748316e225c82 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: digest.asn1 22152 2007-12-04 19:59:18Z lha $
+-- $Id$
 
 DIGEST DEFINITIONS ::=
 BEGIN
index e29a4378785132242736841d1790e4169cb2813c..90f98d8c251937e0c78b4f2229b28a1e730c4423 100644 (file)
@@ -34,7 +34,7 @@
 #include "der_locl.h"
 #include "heim_asn1.h"
 
-RCSID("$Id: extra.c 16672 2006-01-31 09:44:54Z lha $");
+RCSID("$Id$");
 
 int
 encode_heim_any(unsigned char *p, size_t len, 
index 39dba89e4e1cb847a242b6e16f2bc67c4af34600..ddacf7a1c850592f8b8dc55d3c1253b6ccf68df1 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: gen.c 22896 2008-04-07 18:52:24Z lha $");
+RCSID("$Id$");
 
 FILE *headerfile, *codefile, *logfile;
 
index abf11859d5f495cd75dbdb50208fc8871af26bc6..8d41e704c315571c430dcc68a545d9b86dd748dc 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: gen_copy.c 19539 2006-12-28 17:15:05Z lha $");
+RCSID("$Id$");
 
 static int used_fail;
 
index face9ba47a0487761a3e9447ddc9352bc1cf7f73..40751cd077dad234a87551360338620b863c4d0d 100644 (file)
@@ -34,7 +34,7 @@
 #include "gen_locl.h"
 #include "lex.h"
 
-RCSID("$Id: gen_decode.c 21503 2007-07-12 11:57:19Z lha $");
+RCSID("$Id$");
 
 static void
 decode_primitive (const char *typename, const char *name, const char *forwstr)
index 08f1a9449f8baf91dda4105df2bdcccdc9d77bb1..bf26a965a94e34103e69ae34e7ea242f90443be7 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: gen_encode.c 22429 2008-01-13 10:25:50Z lha $");
+RCSID("$Id$");
 
 static void
 encode_primitive (const char *typename, const char *name)
index d667c5d31aad674111eb02c3018c4438e84e9863..1cec79a9118f5127b8122420e948192b10594afb 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: gen_free.c 19539 2006-12-28 17:15:05Z lha $");
+RCSID("$Id$");
 
 static void
 free_primitive (const char *typename, const char *name)
index 8d8bd152a3b70f3fbd685dc33ae5ee4700727d86..b01012be83b2b58756800f1c6b89bf0be1191a40 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: gen_glue.c 15617 2005-07-12 06:27:42Z lha $");
+RCSID("$Id$");
 
 static void
 generate_2int (const Type *t, const char *gen_name)
index 4cb5d45089f5d51e55ad37f6398ef9028e4d606b..a10604a09cc0fbeb7bdc58a1da000f0dbf9ca091 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: gen_length.c 21503 2007-07-12 11:57:19Z lha $");
+RCSID("$Id$");
 
 static void
 length_primitive (const char *typename,
index 8cd4dbad5a84a2727188d0534a508f166f1d6d73..eaf87390f27b729bd8601a116fbd2b44e6c0c858 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: gen_locl.h 18008 2006-09-05 12:29:18Z lha $ */
+/* $Id$ */
 
 #ifndef __GEN_LOCL_H__
 #define __GEN_LOCL_H__
index 54776752c2e3eaa0ac412658f8731ee087cfe489..d7d4fa5d7d82d492ecaf885848ef585958adf17c 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: gen_seq.c 20561 2007-04-24 16:14:30Z lha $");
+RCSID("$Id$");
 
 void
 generate_type_seq (const Symbol *s)
index eeb6b6d63dc9eef3829412c52dbb68a03eaee8f0..f61a3eeb2415eb46d4783ec99827fa1f4085437e 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "gen_locl.h"
 
-RCSID("$Id: hash.c 17016 2006-04-07 22:16:00Z lha $");
+RCSID("$Id$");
 
 static Hashentry *_search(Hashtab * htab,      /* The hash table */
                          void *ptr);   /* And key */
index 10d8ce99b0b5b983465f2698fdeda34496a94e4a..41ecc9de0c5257a65c7d50f9837728ded0a20345 100644 (file)
@@ -35,7 +35,7 @@
  * hash.h. Header file for hash table functions
  */
 
-/* $Id: hash.h 7464 1999-12-02 17:05:13Z joda $ */
+/* $Id$ */
 
 struct hashentry {             /* Entry in bucket */
      struct hashentry **prev;
index ea20eb99d24ba87ba90e12629109ef088d2d17e4..9b36498161facf73dbea742d73dc8879aad5761f 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: k5.asn1 22745 2008-03-24 12:07:54Z lha $
+-- $Id$
 
 KERBEROS5 DEFINITIONS ::=
 BEGIN
@@ -72,6 +72,7 @@ PADATA-TYPE ::= INTEGER {
        KRB5-PADATA-TD-REQ-SEQ(108),            -- INTEGER
        KRB5-PADATA-PA-PAC-REQUEST(128),        -- jbrezak@exchange.microsoft.com
        KRB5-PADATA-S4U2SELF(129),
+       KRB5-PADATA-EPAC(130),                  -- EPAK
        KRB5-PADATA-PK-AS-09-BINDING(132),      -- client send this to 
                                                -- tell KDC that is supports 
                                                -- the asCheckSum in the
@@ -94,7 +95,8 @@ AUTHDATA-TYPE ::= INTEGER {
        KRB5-AUTHDATA-OSF-DCE-PKI-CERTID(66),
        KRB5-AUTHDATA-WIN2K-PAC(128),
        KRB5-AUTHDATA-GSS-API-ETYPE-NEGOTIATION(129), -- Authenticator only
-       KRB5-AUTHDATA-SIGNTICKET(-17)
+       KRB5-AUTHDATA-SIGNTICKET-OLD(-17),
+       KRB5-AUTHDATA-SIGNTICKET(142)
 }
 
 -- checksumtypes
index fc6a696dab3a8c242cd81102196431d28bf2289b..820abc810687bf4d2d52b7a677aec540dbba56c0 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: kx509.asn1 19546 2006-12-28 21:05:23Z lha $
+-- $Id$
 
 KX509 DEFINITIONS ::=
 BEGIN
index 175760be4406d1c45cbbc790776b9d6cbe69a4e5..5efec619eefdb0df8d459e9a9554097b044594eb 100644 (file)
@@ -830,7 +830,7 @@ char *yytext;
  * SUCH DAMAGE. 
  */
 
-/* $Id: lex.l 18738 2006-10-21 11:57:22Z lha $ */
+/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
index 7aececf6d7a02cfbe0db41a48d4977b3e5113048..34cef1716a84170c4744d4259e0f3f44d2fc776b 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: lex.h 15617 2005-07-12 06:27:42Z lha $ */
+/* $Id$ */
 
 #include <roken.h>
 
index ec744220e9c0a353e41653156792971d54f16ed1..e1452c3b04a7ddfc37216ea7ab660c8f8ce56f3c 100644 (file)
@@ -32,7 +32,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: lex.l 18738 2006-10-21 11:57:22Z lha $ */
+/* $Id$ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
index 3b4a8122cadab684784b0d1c0d6a6dc40a74ef68..3e15b39e6afbdc94d2fc006e6710b9d5b4e620a9 100644 (file)
@@ -35,7 +35,7 @@
 #include <getarg.h>
 #include "lex.h"
 
-RCSID("$Id: main.c 20858 2007-06-03 18:56:41Z lha $");
+RCSID("$Id$");
 
 extern FILE *yyin;
 
index 6a3e524e93a949e354eb856ee69029c2eebb1ef9..edd3bba4639ea3b077a93294af371f6d3393c9fd 100644 (file)
 
 
 /* Copy the first part of user declarations.  */
-#line 36 "parse.y"
+#line 36 "heimdal/lib/asn1/parse.y"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #include "gen_locl.h"
 #include "der.h"
 
-RCSID("$Id: parse.y 21597 2007-07-16 18:48:58Z lha $");
+RCSID("$Id$");
 
 static Type *new_type (Typetype t);
 static struct constraint_spec *new_constraint_spec(enum ctype);
@@ -280,7 +280,7 @@ struct string_list {
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
-# define YYDEBUG 1
+# define YYDEBUG 0
 #endif
 
 /* Enabling verbose error messages.  */
@@ -298,7 +298,7 @@ struct string_list {
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 65 "parse.y"
+#line 65 "heimdal/lib/asn1/parse.y"
 {
     int constant;
     struct value *value;
@@ -314,7 +314,7 @@ typedef union YYSTYPE
     struct constraint_spec *constraint_spec;
 }
 /* Line 187 of yacc.c.  */
-#line 318 "parse.c"
+#line 318 "heimdal/lib/asn1/parse.y"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -327,7 +327,7 @@ typedef union YYSTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 331 "parse.c"
+#line 331 "heimdal/lib/asn1/parse.y"
 
 #ifdef short
 # undef short
@@ -1762,29 +1762,29 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 235 "parse.y"
+#line 235 "heimdal/lib/asn1/parse.y"
     {
                        checkundefined();
                }
     break;
 
   case 4:
-#line 242 "parse.y"
+#line 242 "heimdal/lib/asn1/parse.y"
     { error_message("implicit tagging is not supported"); }
     break;
 
   case 5:
-#line 244 "parse.y"
+#line 244 "heimdal/lib/asn1/parse.y"
     { error_message("automatic tagging is not supported"); }
     break;
 
   case 7:
-#line 249 "parse.y"
+#line 249 "heimdal/lib/asn1/parse.y"
     { error_message("no extensibility options supported"); }
     break;
 
   case 17:
-#line 270 "parse.y"
+#line 270 "heimdal/lib/asn1/parse.y"
     { 
                    struct string_list *sl;
                    for(sl = (yyvsp[(1) - (4)].sl); sl != NULL; sl = sl->next) {
@@ -1796,7 +1796,7 @@ yyreduce:
     break;
 
   case 22:
-#line 289 "parse.y"
+#line 289 "heimdal/lib/asn1/parse.y"
     {
                    (yyval.sl) = emalloc(sizeof(*(yyval.sl)));
                    (yyval.sl)->string = (yyvsp[(1) - (3)].name);
@@ -1805,7 +1805,7 @@ yyreduce:
     break;
 
   case 23:
-#line 295 "parse.y"
+#line 295 "heimdal/lib/asn1/parse.y"
     {
                    (yyval.sl) = emalloc(sizeof(*(yyval.sl)));
                    (yyval.sl)->string = (yyvsp[(1) - (1)].name);
@@ -1814,7 +1814,7 @@ yyreduce:
     break;
 
   case 24:
-#line 303 "parse.y"
+#line 303 "heimdal/lib/asn1/parse.y"
     {
                    Symbol *s = addsym ((yyvsp[(1) - (3)].name));
                    s->stype = Stype;
@@ -1825,7 +1825,7 @@ yyreduce:
     break;
 
   case 42:
-#line 334 "parse.y"
+#line 334 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_Boolean, 
                                     TE_EXPLICIT, new_type(TBoolean));
@@ -1833,7 +1833,7 @@ yyreduce:
     break;
 
   case 43:
-#line 341 "parse.y"
+#line 341 "heimdal/lib/asn1/parse.y"
     {
                    if((yyvsp[(2) - (5)].value)->type != integervalue)
                        error_message("Non-integer used in first part of range");
@@ -1846,7 +1846,7 @@ yyreduce:
     break;
 
   case 44:
-#line 351 "parse.y"
+#line 351 "heimdal/lib/asn1/parse.y"
     {          
                    if((yyvsp[(2) - (5)].value)->type != integervalue)
                        error_message("Non-integer in first part of range");
@@ -1857,7 +1857,7 @@ yyreduce:
     break;
 
   case 45:
-#line 359 "parse.y"
+#line 359 "heimdal/lib/asn1/parse.y"
     {          
                    if((yyvsp[(4) - (5)].value)->type != integervalue)
                        error_message("Non-integer in second part of range");
@@ -1868,7 +1868,7 @@ yyreduce:
     break;
 
   case 46:
-#line 367 "parse.y"
+#line 367 "heimdal/lib/asn1/parse.y"
     {
                    if((yyvsp[(2) - (3)].value)->type != integervalue)
                        error_message("Non-integer used in limit");
@@ -1879,7 +1879,7 @@ yyreduce:
     break;
 
   case 47:
-#line 378 "parse.y"
+#line 378 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_Integer, 
                                     TE_EXPLICIT, new_type(TInteger));
@@ -1887,7 +1887,7 @@ yyreduce:
     break;
 
   case 48:
-#line 383 "parse.y"
+#line 383 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_type(TInteger);
                        (yyval.type)->range = (yyvsp[(2) - (2)].range);
@@ -1896,7 +1896,7 @@ yyreduce:
     break;
 
   case 49:
-#line 389 "parse.y"
+#line 389 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TInteger);
                  (yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -1905,7 +1905,7 @@ yyreduce:
     break;
 
   case 50:
-#line 397 "parse.y"
+#line 397 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.members) = emalloc(sizeof(*(yyval.members)));
                        ASN1_TAILQ_INIT((yyval.members));
@@ -1914,7 +1914,7 @@ yyreduce:
     break;
 
   case 51:
-#line 403 "parse.y"
+#line 403 "heimdal/lib/asn1/parse.y"
     {
                        ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), (yyvsp[(3) - (3)].member), members);
                        (yyval.members) = (yyvsp[(1) - (3)].members);
@@ -1922,12 +1922,12 @@ yyreduce:
     break;
 
   case 52:
-#line 408 "parse.y"
+#line 408 "heimdal/lib/asn1/parse.y"
     { (yyval.members) = (yyvsp[(1) - (3)].members); }
     break;
 
   case 53:
-#line 412 "parse.y"
+#line 412 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.member) = emalloc(sizeof(*(yyval.member)));
                        (yyval.member)->name = (yyvsp[(1) - (4)].name);
@@ -1941,7 +1941,7 @@ yyreduce:
     break;
 
   case 54:
-#line 425 "parse.y"
+#line 425 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TInteger);
                  (yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -1950,7 +1950,7 @@ yyreduce:
     break;
 
   case 56:
-#line 436 "parse.y"
+#line 436 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TBitString);
                  (yyval.type)->members = emalloc(sizeof(*(yyval.type)->members));
@@ -1960,7 +1960,7 @@ yyreduce:
     break;
 
   case 57:
-#line 443 "parse.y"
+#line 443 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TBitString);
                  (yyval.type)->members = (yyvsp[(4) - (5)].members);
@@ -1969,7 +1969,7 @@ yyreduce:
     break;
 
   case 58:
-#line 451 "parse.y"
+#line 451 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_OID, 
                                     TE_EXPLICIT, new_type(TOID));
@@ -1977,7 +1977,7 @@ yyreduce:
     break;
 
   case 59:
-#line 457 "parse.y"
+#line 457 "heimdal/lib/asn1/parse.y"
     {
                    Type *t = new_type(TOctetString);
                    t->range = (yyvsp[(3) - (3)].range);
@@ -1987,7 +1987,7 @@ yyreduce:
     break;
 
   case 60:
-#line 466 "parse.y"
+#line 466 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_Null, 
                                     TE_EXPLICIT, new_type(TNull));
@@ -1995,17 +1995,17 @@ yyreduce:
     break;
 
   case 61:
-#line 473 "parse.y"
+#line 473 "heimdal/lib/asn1/parse.y"
     { (yyval.range) = NULL; }
     break;
 
   case 62:
-#line 475 "parse.y"
+#line 475 "heimdal/lib/asn1/parse.y"
     { (yyval.range) = (yyvsp[(2) - (2)].range); }
     break;
 
   case 63:
-#line 480 "parse.y"
+#line 480 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TSequence);
                  (yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -2014,7 +2014,7 @@ yyreduce:
     break;
 
   case 64:
-#line 486 "parse.y"
+#line 486 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TSequence);
                  (yyval.type)->members = NULL;
@@ -2023,7 +2023,7 @@ yyreduce:
     break;
 
   case 65:
-#line 494 "parse.y"
+#line 494 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TSequenceOf);
                  (yyval.type)->range = (yyvsp[(2) - (4)].range);
@@ -2033,7 +2033,7 @@ yyreduce:
     break;
 
   case 66:
-#line 503 "parse.y"
+#line 503 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TSet);
                  (yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -2042,7 +2042,7 @@ yyreduce:
     break;
 
   case 67:
-#line 509 "parse.y"
+#line 509 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TSet);
                  (yyval.type)->members = NULL;
@@ -2051,7 +2051,7 @@ yyreduce:
     break;
 
   case 68:
-#line 517 "parse.y"
+#line 517 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TSetOf);
                  (yyval.type)->subtype = (yyvsp[(3) - (3)].type);
@@ -2060,7 +2060,7 @@ yyreduce:
     break;
 
   case 69:
-#line 525 "parse.y"
+#line 525 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.type) = new_type(TChoice);
                  (yyval.type)->members = (yyvsp[(3) - (4)].members);
@@ -2068,7 +2068,7 @@ yyreduce:
     break;
 
   case 72:
-#line 536 "parse.y"
+#line 536 "heimdal/lib/asn1/parse.y"
     {
                  Symbol *s = addsym((yyvsp[(1) - (1)].name));
                  (yyval.type) = new_type(TType);
@@ -2080,7 +2080,7 @@ yyreduce:
     break;
 
   case 73:
-#line 547 "parse.y"
+#line 547 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_GeneralizedTime, 
                                     TE_EXPLICIT, new_type(TGeneralizedTime));
@@ -2088,7 +2088,7 @@ yyreduce:
     break;
 
   case 74:
-#line 552 "parse.y"
+#line 552 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_UTCTime, 
                                     TE_EXPLICIT, new_type(TUTCTime));
@@ -2096,7 +2096,7 @@ yyreduce:
     break;
 
   case 75:
-#line 559 "parse.y"
+#line 559 "heimdal/lib/asn1/parse.y"
     {
                    /* if (Constraint.type == contentConstrant) {
                       assert(Constraint.u.constraint.type == octetstring|bitstring-w/o-NamedBitList); // remember to check type reference too
@@ -2112,14 +2112,14 @@ yyreduce:
     break;
 
   case 76:
-#line 575 "parse.y"
+#line 575 "heimdal/lib/asn1/parse.y"
     {
                    (yyval.constraint_spec) = (yyvsp[(2) - (3)].constraint_spec);
                }
     break;
 
   case 80:
-#line 588 "parse.y"
+#line 588 "heimdal/lib/asn1/parse.y"
     {
                    (yyval.constraint_spec) = new_constraint_spec(CT_CONTENTS);
                    (yyval.constraint_spec)->u.content.type = (yyvsp[(2) - (2)].type);
@@ -2128,7 +2128,7 @@ yyreduce:
     break;
 
   case 81:
-#line 594 "parse.y"
+#line 594 "heimdal/lib/asn1/parse.y"
     {
                    if ((yyvsp[(3) - (3)].value)->type != objectidentifiervalue)
                        error_message("Non-OID used in ENCODED BY constraint");
@@ -2139,7 +2139,7 @@ yyreduce:
     break;
 
   case 82:
-#line 602 "parse.y"
+#line 602 "heimdal/lib/asn1/parse.y"
     {
                    if ((yyvsp[(5) - (5)].value)->type != objectidentifiervalue)
                        error_message("Non-OID used in ENCODED BY constraint");
@@ -2150,14 +2150,14 @@ yyreduce:
     break;
 
   case 83:
-#line 612 "parse.y"
+#line 612 "heimdal/lib/asn1/parse.y"
     {
                    (yyval.constraint_spec) = new_constraint_spec(CT_USER);
                }
     break;
 
   case 84:
-#line 618 "parse.y"
+#line 618 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_type(TTag);
                        (yyval.type)->tag = (yyvsp[(1) - (3)].tag);
@@ -2171,7 +2171,7 @@ yyreduce:
     break;
 
   case 85:
-#line 631 "parse.y"
+#line 631 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.tag).tagclass = (yyvsp[(2) - (4)].constant);
                        (yyval.tag).tagvalue = (yyvsp[(3) - (4)].constant);
@@ -2180,56 +2180,56 @@ yyreduce:
     break;
 
   case 86:
-#line 639 "parse.y"
+#line 639 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.constant) = ASN1_C_CONTEXT;
                }
     break;
 
   case 87:
-#line 643 "parse.y"
+#line 643 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.constant) = ASN1_C_UNIV;
                }
     break;
 
   case 88:
-#line 647 "parse.y"
+#line 647 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.constant) = ASN1_C_APPL;
                }
     break;
 
   case 89:
-#line 651 "parse.y"
+#line 651 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.constant) = ASN1_C_PRIVATE;
                }
     break;
 
   case 90:
-#line 657 "parse.y"
+#line 657 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.constant) = TE_EXPLICIT;
                }
     break;
 
   case 91:
-#line 661 "parse.y"
+#line 661 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.constant) = TE_EXPLICIT;
                }
     break;
 
   case 92:
-#line 665 "parse.y"
+#line 665 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.constant) = TE_IMPLICIT;
                }
     break;
 
   case 93:
-#line 672 "parse.y"
+#line 672 "heimdal/lib/asn1/parse.y"
     {
                        Symbol *s;
                        s = addsym ((yyvsp[(1) - (4)].name));
@@ -2241,7 +2241,7 @@ yyreduce:
     break;
 
   case 95:
-#line 686 "parse.y"
+#line 686 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_GeneralString, 
                                     TE_EXPLICIT, new_type(TGeneralString));
@@ -2249,7 +2249,7 @@ yyreduce:
     break;
 
   case 96:
-#line 691 "parse.y"
+#line 691 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_UTF8String, 
                                     TE_EXPLICIT, new_type(TUTF8String));
@@ -2257,7 +2257,7 @@ yyreduce:
     break;
 
   case 97:
-#line 696 "parse.y"
+#line 696 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_PrintableString, 
                                     TE_EXPLICIT, new_type(TPrintableString));
@@ -2265,7 +2265,7 @@ yyreduce:
     break;
 
   case 98:
-#line 701 "parse.y"
+#line 701 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_VisibleString, 
                                     TE_EXPLICIT, new_type(TVisibleString));
@@ -2273,7 +2273,7 @@ yyreduce:
     break;
 
   case 99:
-#line 706 "parse.y"
+#line 706 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_IA5String, 
                                     TE_EXPLICIT, new_type(TIA5String));
@@ -2281,7 +2281,7 @@ yyreduce:
     break;
 
   case 100:
-#line 711 "parse.y"
+#line 711 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_BMPString, 
                                     TE_EXPLICIT, new_type(TBMPString));
@@ -2289,7 +2289,7 @@ yyreduce:
     break;
 
   case 101:
-#line 716 "parse.y"
+#line 716 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.type) = new_tag(ASN1_C_UNIV, UT_UniversalString, 
                                     TE_EXPLICIT, new_type(TUniversalString));
@@ -2297,7 +2297,7 @@ yyreduce:
     break;
 
   case 102:
-#line 724 "parse.y"
+#line 724 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.members) = emalloc(sizeof(*(yyval.members)));
                        ASN1_TAILQ_INIT((yyval.members));
@@ -2306,7 +2306,7 @@ yyreduce:
     break;
 
   case 103:
-#line 730 "parse.y"
+#line 730 "heimdal/lib/asn1/parse.y"
     {
                        ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), (yyvsp[(3) - (3)].member), members);
                        (yyval.members) = (yyvsp[(1) - (3)].members);
@@ -2314,7 +2314,7 @@ yyreduce:
     break;
 
   case 104:
-#line 735 "parse.y"
+#line 735 "heimdal/lib/asn1/parse.y"
     {
                        struct member *m = ecalloc(1, sizeof(*m));
                        m->name = estrdup("...");
@@ -2326,7 +2326,7 @@ yyreduce:
     break;
 
   case 105:
-#line 746 "parse.y"
+#line 746 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.member) = emalloc(sizeof(*(yyval.member)));
                  (yyval.member)->name = (yyvsp[(1) - (2)].name);
@@ -2338,7 +2338,7 @@ yyreduce:
     break;
 
   case 106:
-#line 757 "parse.y"
+#line 757 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.member) = (yyvsp[(1) - (1)].member);
                        (yyval.member)->optional = 0;
@@ -2347,7 +2347,7 @@ yyreduce:
     break;
 
   case 107:
-#line 763 "parse.y"
+#line 763 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.member) = (yyvsp[(1) - (2)].member);
                        (yyval.member)->optional = 1;
@@ -2356,7 +2356,7 @@ yyreduce:
     break;
 
   case 108:
-#line 769 "parse.y"
+#line 769 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.member) = (yyvsp[(1) - (3)].member);
                        (yyval.member)->optional = 0;
@@ -2365,7 +2365,7 @@ yyreduce:
     break;
 
   case 109:
-#line 777 "parse.y"
+#line 777 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.members) = emalloc(sizeof(*(yyval.members)));
                        ASN1_TAILQ_INIT((yyval.members));
@@ -2374,7 +2374,7 @@ yyreduce:
     break;
 
   case 110:
-#line 783 "parse.y"
+#line 783 "heimdal/lib/asn1/parse.y"
     {
                        ASN1_TAILQ_INSERT_TAIL((yyvsp[(1) - (3)].members), (yyvsp[(3) - (3)].member), members);
                        (yyval.members) = (yyvsp[(1) - (3)].members);
@@ -2382,7 +2382,7 @@ yyreduce:
     break;
 
   case 111:
-#line 790 "parse.y"
+#line 790 "heimdal/lib/asn1/parse.y"
     {
                  (yyval.member) = emalloc(sizeof(*(yyval.member)));
                  (yyval.member)->name = (yyvsp[(1) - (4)].name);
@@ -2396,26 +2396,26 @@ yyreduce:
     break;
 
   case 113:
-#line 803 "parse.y"
+#line 803 "heimdal/lib/asn1/parse.y"
     { (yyval.objid) = NULL; }
     break;
 
   case 114:
-#line 807 "parse.y"
+#line 807 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.objid) = (yyvsp[(2) - (3)].objid);
                }
     break;
 
   case 115:
-#line 813 "parse.y"
+#line 813 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.objid) = NULL;
                }
     break;
 
   case 116:
-#line 817 "parse.y"
+#line 817 "heimdal/lib/asn1/parse.y"
     {
                        if ((yyvsp[(2) - (2)].objid)) {
                                (yyval.objid) = (yyvsp[(2) - (2)].objid);
@@ -2427,14 +2427,14 @@ yyreduce:
     break;
 
   case 117:
-#line 828 "parse.y"
+#line 828 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.objid) = new_objid((yyvsp[(1) - (4)].name), (yyvsp[(3) - (4)].constant));
                }
     break;
 
   case 118:
-#line 832 "parse.y"
+#line 832 "heimdal/lib/asn1/parse.y"
     {
                    Symbol *s = addsym((yyvsp[(1) - (1)].name));
                    if(s->stype != SValue ||
@@ -2448,14 +2448,14 @@ yyreduce:
     break;
 
   case 119:
-#line 843 "parse.y"
+#line 843 "heimdal/lib/asn1/parse.y"
     {
                    (yyval.objid) = new_objid(NULL, (yyvsp[(1) - (1)].constant));
                }
     break;
 
   case 129:
-#line 866 "parse.y"
+#line 866 "heimdal/lib/asn1/parse.y"
     {
                        Symbol *s = addsym((yyvsp[(1) - (1)].name));
                        if(s->stype != SValue)
@@ -2467,7 +2467,7 @@ yyreduce:
     break;
 
   case 130:
-#line 877 "parse.y"
+#line 877 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.value) = emalloc(sizeof(*(yyval.value)));
                        (yyval.value)->type = stringvalue;
@@ -2476,7 +2476,7 @@ yyreduce:
     break;
 
   case 131:
-#line 885 "parse.y"
+#line 885 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.value) = emalloc(sizeof(*(yyval.value)));
                        (yyval.value)->type = booleanvalue;
@@ -2485,7 +2485,7 @@ yyreduce:
     break;
 
   case 132:
-#line 891 "parse.y"
+#line 891 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.value) = emalloc(sizeof(*(yyval.value)));
                        (yyval.value)->type = booleanvalue;
@@ -2494,7 +2494,7 @@ yyreduce:
     break;
 
   case 133:
-#line 899 "parse.y"
+#line 899 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.value) = emalloc(sizeof(*(yyval.value)));
                        (yyval.value)->type = integervalue;
@@ -2503,13 +2503,13 @@ yyreduce:
     break;
 
   case 135:
-#line 910 "parse.y"
+#line 910 "heimdal/lib/asn1/parse.y"
     {
                }
     break;
 
   case 136:
-#line 915 "parse.y"
+#line 915 "heimdal/lib/asn1/parse.y"
     {
                        (yyval.value) = emalloc(sizeof(*(yyval.value)));
                        (yyval.value)->type = objectidentifiervalue;
@@ -2519,7 +2519,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 2523 "parse.c"
+#line 2523 "heimdal/lib/asn1/parse.y"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2733,7 +2733,7 @@ yyreturn:
 }
 
 
-#line 922 "parse.y"
+#line 922 "heimdal/lib/asn1/parse.y"
 
 
 void
index 5e73094f9e6b2a1833f6d12a411c710437bc7d96..bea506ca7b984ab873e6cae8128e8c1a1a833d24 100644 (file)
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 65 "parse.y"
+#line 65 "heimdal/lib/asn1/parse.y"
 {
     int constant;
     struct value *value;
@@ -238,7 +238,7 @@ typedef union YYSTYPE
     struct constraint_spec *constraint_spec;
 }
 /* Line 1489 of yacc.c.  */
-#line 242 "parse.h"
+#line 242 "heimdal/lib/asn1/parse.y"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
index 772f2b1bc1c3a27c45bfea7d4dea776b05d87691..956386820f7bf665591f82c11f41c0ec3f57ed11 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: parse.y 21597 2007-07-16 18:48:58Z lha $ */
+/* $Id$ */
 
 %{
 #ifdef HAVE_CONFIG_H
@@ -45,7 +45,7 @@
 #include "gen_locl.h"
 #include "der.h"
 
-RCSID("$Id: parse.y 21597 2007-07-16 18:48:58Z lha $");
+RCSID("$Id$");
 
 static Type *new_type (Typetype t);
 static struct constraint_spec *new_constraint_spec(enum ctype);
index 37fe03e58e8a13d8cb5656d7ccbc361096ec73ff..4d6454a08fc39dc0705b2b76c5676ada529fa542 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: pkcs12.asn1 15715 2005-07-23 11:08:47Z lha $ --
+-- $Id$ --
 
 PKCS12 DEFINITIONS ::=
 
index 911e727c708583f3283b401d74af42d94e93266e..203d91eef8290712d3ebcbb479581a06b4f463ce 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: pkcs8.asn1 16060 2005-09-13 19:41:29Z lha $ --
+-- $Id$ --
 
 PKCS8 DEFINITIONS ::=
 
index d985e91f3c03ae02ad59e00f5d379cbab619b4af..50bf9dd1cd716590b03ab9a45df872089205edbe 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: pkcs9.asn1 17202 2006-04-24 08:59:10Z lha $ --
+-- $Id$ --
 
 PKCS9 DEFINITIONS ::=
 
index 9407915c19b72c973b519b192c0c877ca3a45490..4972e265e77a83fb249ec6479ba2caefc308ce81 100644 (file)
@@ -34,7 +34,7 @@
 #include "gen_locl.h"
 #include "lex.h"
 
-RCSID("$Id: symbol.c 15617 2005-07-12 06:27:42Z lha $");
+RCSID("$Id$");
 
 static Hashtab *htab;
 
index d07caf55904283c88977c574b4f1659d03e44d1e..8282e700bae728515482c2a53760bb1ae52dd0ff 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: symbol.h 19539 2006-12-28 17:15:05Z lha $ */
+/* $Id$ */
 
 #ifndef _SYMBOL_H
 #define _SYMBOL_H
index b2f58a20c2ce0286e9dd86683f06112ef77a0f61..d07bba6185be2d1437d4b24db5f406f0221abacc 100644 (file)
@@ -1,4 +1,4 @@
--- $Id: test.asn1 21455 2007-07-10 12:51:19Z lha $ --
+-- $Id$ --
 
 TEST DEFINITIONS ::=
 
index d0fc7d98a44b6cebe2b9a49ae18d51793fd93156..bfb04864818fbdf754fd1635a07b607897d34b5d 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: test.gen 15617 2005-07-12 06:27:42Z lha $
+# $Id$
 # Sample for TESTSeq in test.asn1
 #
 
index 33b9684a5d87f55d6a0b0b5eeb6b362bcb733e3b..5119ee887edd71c59e7e18c661bb8dd88d5861c3 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "der_locl.h"
 
-RCSID("$Id: timegm.c 21366 2007-06-27 10:06:22Z lha $");
+RCSID("$Id$");
 
 static int
 is_leap(unsigned y)
index faf4294cdd8f6bc65c76015d6016ba7f030dc0eb..3dec3b2accb351590f58f4976673f2f1baada2eb 100644 (file)
@@ -33,7 +33,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id: com_err.c 14930 2005-04-24 19:43:06Z lha $");
+RCSID("$Id$");
 #endif
 #include <stdio.h>
 #include <stdlib.h>
index bdd764f7e982b7082f73ee1aa2664c05e9db5450..d7b0912168e58dae2c557f2efb0361cf36f2f90d 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: com_err.h 15566 2005-07-07 14:58:07Z lha $ */
+/* $Id$ */
 
 /* MIT compatible com_err library */
 
index 4d929da866b33617b60561ee353f76590465f3a5..f8cd2b61214adb83f321579695164df340f4c241 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: com_right.h 14551 2005-02-03 08:45:13Z lha $ */
+/* $Id$ */
 
 #ifndef __COM_RIGHT_H__
 #define __COM_RIGHT_H__
index 105765482265b10bf76d754e2607af7a525e6f8e..c5a4f4fbcc0de500b6d90b6c85ecd22fb6317402 100644 (file)
@@ -35,7 +35,7 @@
 #include "compile_et.h"
 #include <getarg.h>
 
-RCSID("$Id: compile_et.c 15426 2005-06-16 19:21:42Z lha $");
+RCSID("$Id$");
 
 #include <roken.h>
 #include <err.h>
index 1c7de5a08b69134082ea9f13b31afb88a28a5180..5563f40e4819fc0796c87359cf64b5fab3e22b45 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: compile_et.h 15426 2005-06-16 19:21:42Z lha $ */
+/* $Id$ */
 
 #ifndef __COMPILE_ET_H__
 #define __COMPILE_ET_H__
index 051078025c563a40688e6e7f43422c40db398f04..51a28b7f48995d9913eb89fc51f11f525a8a59b6 100644 (file)
@@ -33,7 +33,7 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id: error.c 9724 2001-02-28 20:00:13Z joda $");
+RCSID("$Id$");
 #endif
 #include <stdio.h>
 #include <stdlib.h>
index b70ef4749f86ea0336b736ffcc1b65e2fb84ff54..f030831d726e1b7dd4615381fc84cd506f6a9725 100644 (file)
@@ -527,7 +527,7 @@ char *yytext;
 #include "parse.h"
 #include "lex.h"
 
-RCSID("$Id: lex.l 15143 2005-05-16 08:52:54Z lha $");
+RCSID("$Id$");
 
 static unsigned lineno = 1;
 static int getstring(void);
index 89f0387655f4744cfdbf461eb3210eee0ed70ca1..c97324a1a561df98fae283c779170f5f1e4f9444 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: lex.h 8451 2000-06-22 00:42:52Z assar $ */
+/* $Id$ */
 
 void error_message (const char *, ...)
 __attribute__ ((format (printf, 1, 2)));
index 08aef516b304bce23e0de098a5125998b4cc281e..4d56be4da08f4366198cb9b01434ec894bf3269c 100644 (file)
@@ -44,7 +44,7 @@
 #include "parse.h"
 #include "lex.h"
 
-RCSID("$Id: lex.l 15143 2005-05-16 08:52:54Z lha $");
+RCSID("$Id$");
 
 static unsigned lineno = 1;
 static int getstring(void);
index 4bacb721ca112acfb3bab591a2ece14f16737d4b..868e3f39f3fa151dada1d203a8951dbc59e49a95 100644 (file)
@@ -90,7 +90,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 1 "parse.y"
+#line 1 "heimdal/lib/com_err/parse.y"
 
 /*
  * Copyright (c) 1998 - 2000 Kungliga Tekniska Högskolan
 #include "compile_et.h"
 #include "lex.h"
 
-RCSID("$Id: parse.y 15426 2005-06-16 19:21:42Z lha $");
+RCSID("$Id$");
 
 void yyerror (char *s);
 static long name2number(const char *str);
@@ -163,13 +163,13 @@ extern char *yytext;
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 53 "parse.y"
+#line 53 "heimdal/lib/com_err/parse.y"
 {
   char *string;
   int number;
 }
 /* Line 187 of yacc.c.  */
-#line 173 "parse.c"
+#line 173 "heimdal/lib/com_err/parse.y"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -182,7 +182,7 @@ typedef union YYSTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 186 "parse.c"
+#line 186 "heimdal/lib/com_err/parse.y"
 
 #ifdef short
 # undef short
@@ -1381,14 +1381,14 @@ yyreduce:
   switch (yyn)
     {
         case 6:
-#line 73 "parse.y"
+#line 73 "heimdal/lib/com_err/parse.y"
     {
                    id_str = (yyvsp[(2) - (2)].string);
                }
     break;
 
   case 7:
-#line 79 "parse.y"
+#line 79 "heimdal/lib/com_err/parse.y"
     {
                    base_id = name2number((yyvsp[(2) - (2)].string));
                    strlcpy(name, (yyvsp[(2) - (2)].string), sizeof(name));
@@ -1397,7 +1397,7 @@ yyreduce:
     break;
 
   case 8:
-#line 85 "parse.y"
+#line 85 "heimdal/lib/com_err/parse.y"
     {
                    base_id = name2number((yyvsp[(2) - (3)].string));
                    strlcpy(name, (yyvsp[(3) - (3)].string), sizeof(name));
@@ -1407,14 +1407,14 @@ yyreduce:
     break;
 
   case 11:
-#line 98 "parse.y"
+#line 98 "heimdal/lib/com_err/parse.y"
     {
                        number = (yyvsp[(2) - (2)].number);
                }
     break;
 
   case 12:
-#line 102 "parse.y"
+#line 102 "heimdal/lib/com_err/parse.y"
     {
                    free(prefix);
                    asprintf (&prefix, "%s_", (yyvsp[(2) - (2)].string));
@@ -1425,7 +1425,7 @@ yyreduce:
     break;
 
   case 13:
-#line 110 "parse.y"
+#line 110 "heimdal/lib/com_err/parse.y"
     {
                    prefix = realloc(prefix, 1);
                    if (prefix == NULL)
@@ -1435,7 +1435,7 @@ yyreduce:
     break;
 
   case 14:
-#line 117 "parse.y"
+#line 117 "heimdal/lib/com_err/parse.y"
     {
                    struct error_code *ec = malloc(sizeof(*ec));
                    
@@ -1458,7 +1458,7 @@ yyreduce:
     break;
 
   case 15:
-#line 137 "parse.y"
+#line 137 "heimdal/lib/com_err/parse.y"
     {
                        YYACCEPT;
                }
@@ -1466,7 +1466,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 1470 "parse.c"
+#line 1470 "heimdal/lib/com_err/parse.y"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1680,7 +1680,7 @@ yyreturn:
 }
 
 
-#line 142 "parse.y"
+#line 142 "heimdal/lib/com_err/parse.y"
 
 
 static long
index 4c9681ff34f5aaa6e6a84c5b39285fcd5feb2a20..9aabca90236f4b732d92c6930a159af8e4e3c553 100644 (file)
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 53 "parse.y"
+#line 53 "heimdal/lib/com_err/parse.y"
 {
   char *string;
   int number;
 }
 /* Line 1489 of yacc.c.  */
-#line 74 "parse.h"
+#line 74 "heimdal/lib/com_err/parse.y"
        YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
index 315931389fe4bd748ed34ecebc242fe34fa3c007..e9b28370513cfc53e863e55609b90f249b27b636 100644 (file)
@@ -35,7 +35,7 @@
 #include "compile_et.h"
 #include "lex.h"
 
-RCSID("$Id: parse.y 15426 2005-06-16 19:21:42Z lha $");
+RCSID("$Id$");
 
 void yyerror (char *s);
 static long name2number(const char *str);
index 63f66f73133e2ec1d8883cd46ea23f242cb756bd..d6417cdf0c79f244afdc86864d079cbc047431cd 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: gssapi.h 23025 2008-04-17 10:01:57Z lha $ */
+/* $Id$ */
 
 #ifndef GSSAPI_GSSAPI_H_
 #define GSSAPI_GSSAPI_H_
@@ -123,6 +123,7 @@ typedef OM_uint32 gss_qop_t;
 #define GSS_C_DCE_STYLE 4096
 #define GSS_C_IDENTIFY_FLAG 8192
 #define GSS_C_EXTENDED_ERROR_FLAG 16384
+#define GSS_C_DELEG_POLICY_FLAG 32768
 
 /*
  * Credential usage options
index 55f78866588c8c86be32929b9eee55de36a94801..bab719019ddcedc9be96f8924b32fa7a413373a0 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: gssapi_krb5.h 23420 2008-07-26 18:37:48Z lha $ */
+/* $Id$ */
 
 #ifndef GSSAPI_KRB5_H_
 #define GSSAPI_KRB5_H_
index 3358863a801613af9617b09b4e8fee509ae61cbc..6587acd7d01b59994ac4c7d84868ccb7afaa241a 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: gssapi_spnego.h 23025 2008-04-17 10:01:57Z lha $ */
+/* $Id$ */
 
 #ifndef GSSAPI_SPNEGO_H_
 #define GSSAPI_SPNEGO_H_
index 619cbf97fcbdb841511df5558a25fb395feec1b6..a9b93d32a6e2ea29189bc1568c0c26681cce20f6 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: 8003.c 18334 2006-10-07 22:16:04Z lha $");
+RCSID("$Id$");
 
 krb5_error_code
 _gsskrb5_encode_om_uint32(OM_uint32 n, u_char *p)
index 8dbd087da62669129a0c6896630c27544c78ffac..84110b7a827b5ac675e88058540f4604b386db14 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: accept_sec_context.c 23433 2008-07-26 18:44:26Z lha $");
+RCSID("$Id$");
 
 HEIMDAL_MUTEX gssapi_keytab_mutex = HEIMDAL_MUTEX_INITIALIZER;
 krb5_keytab _gsskrb5_keytab;
@@ -371,9 +371,8 @@ gsskrb5_acceptor_start(OM_uint32 * minor_status,
        if (kret) {
            if (in)
                krb5_rd_req_in_ctx_free(context, in);
-           ret = GSS_S_FAILURE;
            *minor_status = kret;
-           return ret;
+           return GSS_S_FAILURE;
        }
 
        kret = krb5_rd_req_ctx(context,
@@ -382,13 +381,18 @@ gsskrb5_acceptor_start(OM_uint32 * minor_status,
                               server,
                               in, &out);
        krb5_rd_req_in_ctx_free(context, in);
-       if (kret) {
+       if (kret == KRB5KRB_AP_ERR_SKEW) {
            /* 
             * No reply in non-MUTUAL mode, but we don't know that its
-            * non-MUTUAL mode yet, thats inside the 8003 checksum.
+            * non-MUTUAL mode yet, thats inside the 8003 checksum, so
+            * lets only send the error token on clock skew, that
+            * limit when send error token for non-MUTUAL.
             */
            return send_error_token(minor_status, context, kret,
                                    server, &indata, output_token);
+       } else if (kret) {
+           *minor_status = kret;
+           return GSS_S_FAILURE;
        }
 
        /*
@@ -520,16 +524,36 @@ gsskrb5_acceptor_start(OM_uint32 * minor_status,
     
     if(ctx->flags & GSS_C_MUTUAL_FLAG) {
        krb5_data outbuf;
+       int use_subkey = 0;
            
        _gsskrb5i_is_cfx(ctx, &is_cfx);
            
-       if (is_cfx != 0 
-           || (ap_options & AP_OPTS_USE_SUBKEY)) {
-           kret = krb5_auth_con_addflags(context,
-                                         ctx->auth_context,
-                                         KRB5_AUTH_CONTEXT_USE_SUBKEY,
-                                         NULL);
+       if (is_cfx || (ap_options & AP_OPTS_USE_SUBKEY)) {
+           use_subkey = 1;
+       } else {
+           krb5_keyblock *rkey;
+
+           /* 
+            * If there is a initiator subkey, copy that to acceptor
+            * subkey to match Windows behavior
+            */
+           kret = krb5_auth_con_getremotesubkey(context,
+                                                ctx->auth_context,
+                                                &rkey);
+           if (kret == 0) {
+               kret = krb5_auth_con_setlocalsubkey(context, 
+                                                   ctx->auth_context,
+                                                   rkey);
+               if (kret == 0)
+                   use_subkey = 1;
+               krb5_free_keyblock(context, rkey);
+           }
+       }
+       if (use_subkey) {
            ctx->more_flags |= ACCEPTOR_SUBKEY;
+           krb5_auth_con_addflags(context, ctx->auth_context,
+                                  KRB5_AUTH_CONTEXT_USE_SUBKEY,
+                                  NULL);
        }
            
        kret = krb5_mk_rep(context,
index 051446c19b4d4e09bc32f2b048816ce1106d7647..a7caf1a32ed8d95afaf3412c093d8e56c28987e3 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: acquire_cred.c 22596 2008-02-18 18:05:55Z lha $");
+RCSID("$Id$");
 
 OM_uint32
 __gsskrb5_ccache_lifetime(OM_uint32 *minor_status,
@@ -134,11 +134,16 @@ static OM_uint32 acquire_initiator_cred
      * errors while searching.
      */
 
-    if (handle->principal)
+    if (handle->principal) {
        kret = krb5_cc_cache_match (context,
                                    handle->principal,
                                    NULL,
                                    &ccache);
+       if (kret == 0) {
+           ret = GSS_S_COMPLETE;
+           goto found;
+       }
+    }
     
     if (ccache == NULL) {
        kret = krb5_cc_default(context, &ccache);
@@ -211,7 +216,7 @@ static OM_uint32 acquire_initiator_cred
        }
        kret = 0;
     }
-
+ found:
     handle->ccache = ccache;
     ret = GSS_S_COMPLETE;
 
@@ -242,7 +247,6 @@ static OM_uint32 acquire_acceptor_cred
     OM_uint32 ret;
     krb5_error_code kret;
 
-    kret = 0;
     ret = GSS_S_FAILURE;
     kret = get_keytab(context, &handle->keytab);
     if (kret)
@@ -336,13 +340,13 @@ OM_uint32 _gsskrb5_acquire_cred
     HEIMDAL_MUTEX_init(&handle->cred_id_mutex);
 
     if (desired_name != GSS_C_NO_NAME) {
-       krb5_principal name = (krb5_principal)desired_name;
-       ret = krb5_copy_principal(context, name, &handle->principal);
+
+       ret = _gsskrb5_canon_name(minor_status, context, 0, desired_name, 
+                                 &handle->principal);
        if (ret) {
            HEIMDAL_MUTEX_destroy(&handle->cred_id_mutex);
-           *minor_status = ret;
            free(handle);
-           return GSS_S_FAILURE;
+           return ret;
        }
     }
     if (cred_usage == GSS_C_INITIATE || cred_usage == GSS_C_BOTH) {
index 9a1045a889f630b3e5a7cfdcafdb421667c94691..5cd17eb35d0e975743893caa1c61129cb291c5ca 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: add_cred.c 20688 2007-05-17 18:44:31Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_add_cred (
      OM_uint32           *minor_status,
index 032da36ebc86a4dfd33d08cdd3ab4f0c24dfe122..2f39a4e400046db79eb33908e9b7609a67cedace 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: arcfour.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 /*
  * Implements draft-brezak-win2k-krb-rc4-hmac-04.txt
index c1744abd3becbc207a81b65cede3edb09d970426..f2143560d06c2a549a80b801ed89675096126564 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: canonicalize_name.c 18334 2006-10-07 22:16:04Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_canonicalize_name (
             OM_uint32 * minor_status,
@@ -42,5 +42,19 @@ OM_uint32 _gsskrb5_canonicalize_name (
             gss_name_t * output_name
            )
 {
-    return _gsskrb5_duplicate_name (minor_status, input_name, output_name);
+    krb5_context context;
+    krb5_principal name;
+    OM_uint32 ret;
+
+    *output_name = NULL;
+
+    GSSAPI_KRB5_INIT (&context);
+
+    ret = _gsskrb5_canon_name(minor_status, context, 1, input_name, &name);
+    if (ret)
+       return ret;
+
+    *output_name = (gss_name_t)name;
+
+    return GSS_S_COMPLETE;
 }
index bc0d736e81ac8230bb7e97da71722a2fc0c80c2e..188344fb26129d8e5636d31481eae45cd51bc3f6 100755 (executable)
@@ -32,7 +32,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: cfx.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 /*
  * Implementation of draft-ietf-krb-wg-gssapi-cfx-06.txt
old mode 100755 (executable)
new mode 100644 (file)
index 672704a..c30ed07
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: cfx.h 19031 2006-11-13 18:02:57Z lha $ */
+/* $Id$ */
 
 #ifndef GSSAPI_CFX_H_
 #define GSSAPI_CFX_H_ 1
index 3f3b59d11621b8432b97f2737895b7de23c0c37e..a5406a7f2ae01b5cfc1f08fee1645b08f2558676 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: compare_name.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_compare_name
            (OM_uint32 * minor_status,
index a0f075621a4991032f820a62a248405d3562c3cb..0caada04f6d577777a511072955476af2d361314 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: compat.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 
 static krb5_error_code
index b57ac7854e69394175fdb379ca09f507063ff544..7f70be733e63b2bca0a9fff0cf1ab9b4ad400854 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: context_time.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32
 _gsskrb5_lifetime_left(OM_uint32 *minor_status, 
index 66d797c19933f0def47c3014b2e06dfde7487592..fd348e841b148b8fd01198992b60d46184d44236 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: copy_ccache.c 20688 2007-05-17 18:44:31Z lha $");
+RCSID("$Id$");
 
 #if 0
 OM_uint32
index 39176faff44242ca9a9fdc401b938dc9181eea88..419e61a436d1ecb55249b7976a260c7ffe30329b 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: decapsulate.c 18334 2006-10-07 22:16:04Z lha $");
+RCSID("$Id$");
 
 /*
  * return the length of the mechanism in token or -1
index 9c618ac6a621b6a1b54aea21279354b505e8f3f4..ec680d737895eb780cd85c811f0214d12fb25cdb 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: delete_sec_context.c 23420 2008-07-26 18:37:48Z lha $");
+RCSID("$Id$");
 
 OM_uint32
 _gsskrb5_delete_sec_context(OM_uint32 * minor_status,
index 727c447d2a0630e0bfe1fd480de39992f8374b9c..a902ff7ea55c745e2f78f37bda50d2e047ea03d5 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: display_name.c 21077 2007-06-12 22:42:56Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_display_name
            (OM_uint32 * minor_status,
index f932261ffa098b30b9c0088172993d6ce5b3d3a5..52a651c506e088f9f20317258691a59321368588 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: display_status.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 static const char *
 calling_error(OM_uint32 v)
@@ -122,7 +122,7 @@ _gsskrb5_clear_status (void)
 }
 
 void
-_gsskrb5_set_status (const char *fmt, ...)
+_gsskrb5_set_status (int ret, const char *fmt, ...)
 {
     krb5_context context;
     va_list args;
@@ -135,7 +135,7 @@ _gsskrb5_set_status (const char *fmt, ...)
     vasprintf(&str, fmt, args);
     va_end(args);
     if (str) {
-       krb5_set_error_message(context, 0, str);
+       krb5_set_error_message(context, ret, str);
        free(str);
     }
 }
@@ -171,14 +171,13 @@ OM_uint32 _gsskrb5_display_status
                      calling_error(GSS_CALLING_ERROR(status_value)),
                      routine_error(GSS_ROUTINE_ERROR(status_value)));
     } else if (status_type == GSS_C_MECH_CODE) {
-       buf = krb5_get_error_string(context);
-       if (buf == NULL) {
-           const char *tmp = krb5_get_err_text (context, status_value);
-           if (tmp == NULL)
-               asprintf(&buf, "unknown mech error-code %u",
-                        (unsigned)status_value);
-           else
-               buf = strdup(tmp);
+       const char *buf2 = krb5_get_error_message(context, status_value);
+       if (buf2) {
+           buf = strdup(buf2);
+           krb5_free_error_message(context, buf2);
+       } else {
+           asprintf(&buf, "unknown mech error-code %u",
+                    (unsigned)status_value);
        }
     } else {
        *minor_status = EINVAL;
index 7337f1ab72b885db80b552f0954955aa56eb3cb0..eeb777ed5f79a94bb46aa68375f24969eca8c1af 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: duplicate_name.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_duplicate_name (
             OM_uint32 * minor_status,
@@ -41,18 +41,19 @@ OM_uint32 _gsskrb5_duplicate_name (
             gss_name_t * dest_name
            )
 {
-    krb5_context context;
     krb5_const_principal src = (krb5_const_principal)src_name;
-    krb5_principal *dest = (krb5_principal *)dest_name;
+    krb5_context context;
+    krb5_principal dest;
     krb5_error_code kret;
 
     GSSAPI_KRB5_INIT (&context);
 
-    kret = krb5_copy_principal (context, src, dest);
+    kret = krb5_copy_principal (context, src, &dest);
     if (kret) {
        *minor_status = kret;
        return GSS_S_FAILURE;
     } else {
+       *dest_name = (gss_name_t)dest;
        *minor_status = 0;
        return GSS_S_COMPLETE;
     }
index 58dcb5c9c4b241896b5ee8beff0a7349416a1d4c..3f42899a40cc23ed808a4d812456e7656595dea3 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: encapsulate.c 18459 2006-10-14 10:12:16Z lha $");
+RCSID("$Id$");
 
 void
 _gssapi_encap_length (size_t data_len,
index efa45a2638bfac1e0f13e0d382183ceb1a3280eb..92ee101b0dbf92960289e44b09576fedddafa6e3 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: export_name.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_export_name
            (OM_uint32  * minor_status,
index 00218617a07b0fb479feccfdceff0c82d5f94bab..2bc50a04eebfa888a1253d5ac4418402a0c30f2e 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: export_sec_context.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32
 _gsskrb5_export_sec_context (
index 2ee018708a536f583b9f66167d6ab9f78f2ca192..87e4aa01df72e97231323e1bf7914e52b798d1ec 100644 (file)
@@ -34,7 +34,7 @@
 #include "krb5/gsskrb5_locl.h"
 #include <gssapi_mech.h>
 
-RCSID("$Id: external.c 23420 2008-07-26 18:37:48Z lha $");
+RCSID("$Id$");
 
 /*
  * The implementation must reserve static storage for a
index f689e624a89b23ed0db6a0561cd87b4d9fef65cd..98a3f7e2259aff13cd00825cb8ad11d37d85cc52 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: get_mic.c 23112 2008-04-27 18:51:26Z lha $");
+RCSID("$Id$");
 
 static OM_uint32
 mic_des
index dbfdbdf2f122669e53bf2c81b4b5fc26a75039d5..3c23412a6aee963f6440e6b23df1a1cf605ae6ef 100644 (file)
@@ -2,7 +2,7 @@
 # extended gss krb5 error messages
 #
 
-id "$Id: gkrb5_err.et 20049 2007-01-24 00:14:24Z lha $"
+id "$Id$"
 
 error_table gk5
 
index d9af44f960cd1d09105a2a2da361b9bb453210c4..dc7adec68f17c0269a8a7540fcd30e0982d85b45 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: gsskrb5_locl.h 23435 2008-07-26 20:49:35Z lha $ */
+/* $Id$ */
 
 #ifndef GSSKRB5_LOCL_H
 #define GSSKRB5_LOCL_H
@@ -137,4 +137,7 @@ struct gssapi_thr_context {
 #define SC_LOCAL_SUBKEY          0x08
 #define SC_REMOTE_SUBKEY  0x10
 
+/* type to signal that that dns canon maybe should be done */
+#define MAGIC_HOSTBASED_NAME_TYPE 4711
+
 #endif
index bf31db923256a345df76246fbffb02d44e76354a..9589979ee869e862e6ba6ac8e39507e0b9d7aacc 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: import_name.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 static OM_uint32
 parse_krb5_name (OM_uint32 *minor_status,
@@ -83,18 +83,56 @@ import_krb5_name (OM_uint32 *minor_status,
     return ret;
 }
 
+OM_uint32
+_gsskrb5_canon_name(OM_uint32 *minor_status, krb5_context context,
+                   int use_dns, gss_name_t name, krb5_principal *out)
+{
+    krb5_principal p = (krb5_principal)name;
+    krb5_error_code ret;
+    char *hostname = NULL, *service;
+
+    *minor_status = 0;
+
+    /* If its not a hostname */
+    if (krb5_principal_get_type(context, p) != MAGIC_HOSTBASED_NAME_TYPE) {
+       ret = krb5_copy_principal(context, p, out);
+    } else if (!use_dns) {
+       ret = krb5_copy_principal(context, p, out);
+       if (ret == 0)
+           krb5_principal_set_type(context, *out, KRB5_NT_SRV_HST);
+    } else {
+       if (p->name.name_string.len == 0)
+           return GSS_S_BAD_NAME;
+       else if (p->name.name_string.len > 1)
+           hostname = p->name.name_string.val[1];
+       
+       service = p->name.name_string.val[0];
+       
+       ret = krb5_sname_to_principal(context,
+                                     hostname,
+                                     service,
+                                     KRB5_NT_SRV_HST,
+                                     out);
+    }
+
+    if (ret) {
+       *minor_status = ret;
+       return GSS_S_FAILURE;
+    }
+
+    return 0;
+}
+
+
 static OM_uint32
 import_hostbased_name (OM_uint32 *minor_status,
                       krb5_context context,
                       const gss_buffer_t input_name_buffer,
                       gss_name_t *output_name)
 {
-    krb5_error_code kerr;
-    char *tmp;
-    char *p;
-    char *host;
-    char local_hostname[MAXHOSTNAMELEN];
     krb5_principal princ = NULL;
+    krb5_error_code kerr;
+    char *tmp, *p, *host = NULL;
 
     tmp = malloc (input_name_buffer->length + 1);
     if (tmp == NULL) {
@@ -110,31 +148,20 @@ import_hostbased_name (OM_uint32 *minor_status,
     if (p != NULL) {
        *p = '\0';
        host = p + 1;
-    } else {
-       if (gethostname(local_hostname, sizeof(local_hostname)) < 0) {
-           *minor_status = errno;
-           free (tmp);
-           return GSS_S_FAILURE;
-       }
-       host = local_hostname;
     }
 
-    kerr = krb5_sname_to_principal (context,
-                                   host,
-                                   tmp,
-                                   KRB5_NT_SRV_HST,
-                                   &princ);
+    kerr = krb5_make_principal(context, &princ, NULL, tmp, host, NULL);
     free (tmp);
     *minor_status = kerr;
-    if (kerr == 0) {
-       *output_name = (gss_name_t)princ;
-       return GSS_S_COMPLETE;
-    }
-
     if (kerr == KRB5_PARSE_ILLCHAR || kerr == KRB5_PARSE_MALFORMED)
        return GSS_S_BAD_NAME;
+    else if (kerr)
+       return GSS_S_FAILURE;
 
-    return GSS_S_FAILURE;
+    krb5_principal_set_type(context, princ, MAGIC_HOSTBASED_NAME_TYPE);
+    *output_name = (gss_name_t)princ;
+
+    return 0;
 }
 
 static OM_uint32
index 5fd8c941042020fef32a10a6fbbe49e18309f25c..1b709657f4b286cf91e1d818a30936cf63951bc8 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: import_sec_context.c 22997 2008-04-15 19:36:25Z lha $");
+RCSID("$Id$");
 
 OM_uint32
 _gsskrb5_import_sec_context (
index eb886c24d347e4cf9e608a37866a21c4edb0d542..b0219fc7ced89f5bad170c05859a00479765800a 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: indicate_mechs.c 20688 2007-05-17 18:44:31Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_indicate_mechs
            (OM_uint32 * minor_status,
index 3bbdcc8ff1a2b2859d81de834951ded8128a2f36..ea32fce061e6c2599e7ff1a9564ec677d6e557d7 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: init.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 static HEIMDAL_MUTEX context_mutex = HEIMDAL_MUTEX_INITIALIZER;
 static int created_key;
index c9b9e155888f54384a35f37d32dc028bb93c5086..3d5e3b71c5496283baa9074ed29d4e421007fe70 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: init_sec_context.c 23422 2008-07-26 18:38:29Z lha $");
+RCSID("$Id$");
 
 /*
  * copy the addresses from `input_chan_bindings' (if any) to
@@ -271,6 +271,7 @@ do_delegation (krb5_context context,
               krb5_creds *cred,
               krb5_const_principal name,
               krb5_data *fwd_data,
+              uint32_t flagmask,
               uint32_t *flags)
 {
     krb5_creds creds;
@@ -314,9 +315,9 @@ do_delegation (krb5_context context,
        
  out:
     if (kret)
-       *flags &= ~GSS_C_DELEG_FLAG;
+       *flags &= ~flagmask;
     else
-       *flags |= GSS_C_DELEG_FLAG;
+       *flags |= flagmask;
        
     if (creds.client)
        krb5_free_principal(context, creds.client);
@@ -334,7 +335,7 @@ init_auth
  gsskrb5_cred cred,
  gsskrb5_ctx ctx,
  krb5_context context,
krb5_const_principal name,
gss_name_t name,
  const gss_OID mech_type,
  OM_uint32 req_flags,
  OM_uint32 time_req,
@@ -350,6 +351,7 @@ init_auth
     krb5_data outbuf;
     krb5_data fwd_data;
     OM_uint32 lifetime_rec;
+    int use_dns = 1;
 
     krb5_data_zero(&outbuf);
     krb5_data_zero(&fwd_data);
@@ -377,13 +379,21 @@ init_auth
        goto failure;
     }
 
-    kret = krb5_copy_principal (context, name, &ctx->target);
-    if (kret) {
-       *minor_status = kret;
-       ret = GSS_S_FAILURE;
-       goto failure;
+    /* canon name if needed for client + target realm */
+    kret = krb5_cc_get_config(context, ctx->ccache, NULL,
+                             "realm-config", &outbuf);
+    if (kret == 0) {
+       /* XXX 2 is no server canon */
+       if (outbuf.length < 1 || ((((unsigned char *)outbuf.data)[0]) & 2))
+           use_dns = 0;
+       krb5_data_free(&outbuf);
     }
 
+    ret = _gsskrb5_canon_name(minor_status, context, use_dns, 
+                             name, &ctx->target);
+    if (ret)
+       goto failure;
+
     ret = _gss_DES3_get_mic_compat(minor_status, ctx, context);
     if (ret)
        goto failure;
@@ -479,6 +489,7 @@ init_auth_restart
     krb5_enctype enctype;
     krb5_data fwd_data, timedata;
     int32_t offset = 0, oldoffset;
+    uint32_t flagmask;
 
     krb5_data_zero(&outbuf);
     krb5_data_zero(&fwd_data);
@@ -486,41 +497,41 @@ init_auth_restart
     *minor_status = 0;
 
     /* 
-     * If the credential doesn't have ok-as-delegate, check what local
-     * policy say about ok-as-delegate, default is FALSE that makes
-     * code ignore the KDC setting and follow what the application
-     * requested. If it is TRUE, strip of the GSS_C_DELEG_FLAG if the
-     * KDC doesn't set ok-as-delegate.
+     * If the credential doesn't have ok-as-delegate, check if there
+     * is a realm setting and use that.
      */
     if (!ctx->kcred->flags.b.ok_as_delegate) {
-       krb5_boolean delegate, realm_setting;
        krb5_data data;
-    
-       realm_setting = FALSE;
-
+       
        ret = krb5_cc_get_config(context, ctx->ccache, NULL,
                                 "realm-config", &data);
        if (ret == 0) {
            /* XXX 1 is use ok-as-delegate */
-           if (data.length > 0 && (((unsigned char *)data.data)[0]) & 1)
-               realm_setting = TRUE;
+           if (data.length < 1 || ((((unsigned char *)data.data)[0]) & 1) == 0)
+               req_flags &= ~(GSS_C_DELEG_FLAG|GSS_C_DELEG_POLICY_FLAG);
            krb5_data_free(&data);
        }
-
-       krb5_appdefault_boolean(context, "gssapi", ctx->target->realm,
-                               "ok-as-delegate", realm_setting,
-                               &delegate);
-       if (delegate)
-           req_flags &= ~GSS_C_DELEG_FLAG;
     }
 
+    flagmask = 0;
+
+    /* if we used GSS_C_DELEG_POLICY_FLAG, trust KDC */
+    if ((req_flags & GSS_C_DELEG_POLICY_FLAG)
+       && ctx->kcred->flags.b.ok_as_delegate)
+       flagmask |= GSS_C_DELEG_FLAG | GSS_C_DELEG_POLICY_FLAG;
+    /* if there still is a GSS_C_DELEG_FLAG, use that */
+    if (req_flags & GSS_C_DELEG_FLAG)
+       flagmask |= GSS_C_DELEG_FLAG;
+
+
     flags = 0;
     ap_options = 0;
-    if (req_flags & GSS_C_DELEG_FLAG)
+    if (flagmask & GSS_C_DELEG_FLAG) {
        do_delegation (context,
                       ctx->auth_context,
                       ctx->ccache, ctx->kcred, ctx->target,
-                      &fwd_data, &flags);
+                      &fwd_data, flagmask, &flags);
+    }
     
     if (req_flags & GSS_C_MUTUAL_FLAG) {
        flags |= GSS_C_MUTUAL_FLAG;
@@ -817,7 +828,6 @@ OM_uint32 _gsskrb5_init_sec_context
 {
     krb5_context context;
     gsskrb5_cred cred = (gsskrb5_cred)cred_handle;
-    krb5_const_principal name = (krb5_const_principal)target_name;
     gsskrb5_ctx ctx;
     OM_uint32 ret;
 
@@ -880,7 +890,7 @@ OM_uint32 _gsskrb5_init_sec_context
                        cred,
                        ctx,
                        context,
-                       name,
+                       target_name,
                        mech_type,
                        req_flags,
                        time_req,
@@ -926,11 +936,16 @@ OM_uint32 _gsskrb5_init_sec_context
         * If we get there, the caller have called
         * gss_init_sec_context() one time too many.
         */
-       *minor_status = 0;
+       _gsskrb5_set_status(EINVAL, "init_sec_context "
+                           "called one time too many");
+       *minor_status = EINVAL;
        ret = GSS_S_BAD_STATUS;
        break;
     default:
-       *minor_status = 0;
+       _gsskrb5_set_status(EINVAL, "init_sec_context "
+                           "invalid state %d for client",
+                           (int)ctx->state);
+       *minor_status = EINVAL;
        ret = GSS_S_BAD_STATUS;
        break;
     }
index 41430568b0056e847c0cc304676d8cc812f8ba3c..f2e01b464afe7e099435888d3c449d683fd68307 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: inquire_context.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_inquire_context (
     OM_uint32 * minor_status,
index 47bf71e686ff7639167bb2cf8aea2d69d375d545..42488c718cad2bb483f8229b4b5a7a5efee8c72f 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: inquire_cred.c 20688 2007-05-17 18:44:31Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_inquire_cred
 (OM_uint32 * minor_status,
index a8af2145bea8aa8ab7ae09f63c1abadb14090b13..de7ec6cd75c37fba1d697c110eaa7373eb5f0b6b 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: inquire_cred_by_mech.c 20634 2007-05-09 15:33:01Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_inquire_cred_by_mech (
     OM_uint32 * minor_status,
index da50b11d934ad307514cf3195fe6460bfb2edef4..2bcc17683b401aaf0dcc780264d5a7a962e2637a 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: inquire_cred_by_oid.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_inquire_cred_by_oid
           (OM_uint32 * minor_status,
index 0ce051f19c0c9856c893e6d7e47f26166e25f33c..2384c29656f362f4edc91458208c1c3497a19e5f 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: inquire_mechs_for_name.c 20688 2007-05-17 18:44:31Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_inquire_mechs_for_name (
             OM_uint32 * minor_status,
index 64abd3c34a9fd7c218fd27b47a35d18f1d2d89d4..c07eb60108059e1399c03520727e1d668d3c7342 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: inquire_names_for_mech.c 20688 2007-05-17 18:44:31Z lha $");
+RCSID("$Id$");
 
 
 static gss_OID *name_list[] = {
index 5ca7536e6a39a38403bed545040251f1b82b3cc8..24b640f4b5233f8b49e7cf647f69fd4e9b31096a 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: inquire_sec_context_by_oid.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 static int
 oid_prefix_equal(gss_OID oid_enc, gss_OID prefix_enc, unsigned *suffix)
@@ -84,7 +84,7 @@ static OM_uint32 inquire_sec_context_tkt_flags
 
     if (context_handle->ticket == NULL) {
        HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
-       _gsskrb5_set_status("No ticket from which to obtain flags");
+       _gsskrb5_set_status(EINVAL, "No ticket from which to obtain flags");
        *minor_status = EINVAL;
        return GSS_S_BAD_MECH;
     }
@@ -137,7 +137,7 @@ static OM_uint32 inquire_sec_context_get_subkey
        ret = _gsskrb5i_get_token_key(context_handle, context, &key);
        break;
     default:
-       _gsskrb5_set_status("%d is not a valid subkey type", keytype);
+       _gsskrb5_set_status(EINVAL, "%d is not a valid subkey type", keytype);
        ret = EINVAL;
        break;
    }
@@ -145,7 +145,7 @@ static OM_uint32 inquire_sec_context_get_subkey
     if (ret) 
        goto out;
     if (key == NULL) {
-       _gsskrb5_set_status("have no subkey of type %d", keytype);
+       _gsskrb5_set_status(EINVAL, "have no subkey of type %d", keytype);
        ret = EINVAL;
        goto out;
     }
@@ -199,7 +199,7 @@ static OM_uint32 inquire_sec_context_authz_data
     if (context_handle->ticket == NULL) {
        HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
        *minor_status = EINVAL;
-       _gsskrb5_set_status("No ticket to obtain authz data from");
+       _gsskrb5_set_status(EINVAL, "No ticket to obtain authz data from");
        return GSS_S_NO_CONTEXT;
     }
 
@@ -301,12 +301,16 @@ export_lucid_sec_context_v1(OM_uint32 *minor_status,
                                     context_handle->auth_context,
                                     &number);
     ret = krb5_store_uint32(sp, (uint32_t)0); /* store top half as zero */
+    if (ret) goto out;
     ret = krb5_store_uint32(sp, (uint32_t)number);
+    if (ret) goto out;
     krb5_auth_getremoteseqnumber (context,
                                  context_handle->auth_context,
                                  &number);
     ret = krb5_store_uint32(sp, (uint32_t)0); /* store top half as zero */
+    if (ret) goto out;
     ret = krb5_store_uint32(sp, (uint32_t)number);
+    if (ret) goto out;
     ret = krb5_store_int32(sp, (is_cfx) ? 1 : 0);
     if (ret) goto out;
 
@@ -401,7 +405,7 @@ get_authtime(OM_uint32 *minor_status,
     HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
     if (ctx->ticket == NULL) {
        HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex);
-       _gsskrb5_set_status("No ticket to obtain auth time from");
+       _gsskrb5_set_status(EINVAL, "No ticket to obtain auth time from");
        *minor_status = EINVAL;
        return GSS_S_FAILURE;
     }
@@ -441,7 +445,7 @@ get_service_keyblock
     HEIMDAL_MUTEX_lock(&ctx->ctx_id_mutex);
     if (ctx->service_keyblock == NULL) {
        HEIMDAL_MUTEX_unlock(&ctx->ctx_id_mutex);
-       _gsskrb5_set_status("No service keyblock on gssapi context");
+       _gsskrb5_set_status(EINVAL, "No service keyblock on gssapi context");
        *minor_status = EINVAL;
        return GSS_S_FAILURE; 
     }
index f79c9374a9c7583ebb5bb772776bb952e9613143..a7372d87ccef7521f0732cd9d2faa50175228fd5 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: prf.c 21129 2007-06-18 20:28:44Z lha $");
+RCSID("$Id$");
 
 OM_uint32
 _gsskrb5_pseudo_random(OM_uint32 *minor_status,
@@ -72,14 +72,14 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_status,
        _gsskrb5i_get_initiator_subkey(ctx, context, &key);
        break;
     default:
-       _gsskrb5_set_status("unknown kerberos prf_key");
-       *minor_status = 0;
+       _gsskrb5_set_status(EINVAL, "unknown kerberos prf_key");
+       *minor_status = EINVAL;
        return GSS_S_FAILURE;
     }
 
     if (key == NULL) {
-       _gsskrb5_set_status("no prf_key found");
-       *minor_status = 0;
+       _gsskrb5_set_status(EINVAL, "no prf_key found");
+       *minor_status = EINVAL;
        return GSS_S_FAILURE;
     }
 
@@ -92,7 +92,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_status,
 
     prf_out->value = malloc(desired_output_len);
     if (prf_out->value == NULL) {
-       _gsskrb5_set_status("Out of memory");
+       _gsskrb5_set_status(GSS_KRB5_S_KG_INPUT_TOO_LONG, "Out of memory");
        *minor_status = GSS_KRB5_S_KG_INPUT_TOO_LONG;
        krb5_crypto_destroy(context, crypto);
        return GSS_S_FAILURE;
@@ -105,7 +105,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_status,
     input.data = malloc(prf_in->length + 4);
     if (input.data == NULL) {
        OM_uint32 junk;
-       _gsskrb5_set_status("Out of memory");
+       _gsskrb5_set_status(GSS_KRB5_S_KG_INPUT_TOO_LONG, "Out of memory");
        *minor_status = GSS_KRB5_S_KG_INPUT_TOO_LONG;
        gss_release_buffer(&junk, prf_out);
        krb5_crypto_destroy(context, crypto);
index 15638f57fcc5644982e42d39eb14b5a6b741d245..80d96f5ce4458480b3e603092815b6b889682825 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: process_context_token.c 19031 2006-11-13 18:02:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_process_context_token (
        OM_uint32          *minor_status,
index 5dff62631ab4f86be0171336fdbac85ece521896..e2f1f4ec14a554ece2686543e883ce6ac396ae2a 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: release_buffer.c 18334 2006-10-07 22:16:04Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_release_buffer
            (OM_uint32 * minor_status,
index ab5695b097b1bf9fa06fe51f1aceb694fdec1d8d..1becd1c6b18df3510e23ec1a6dab41f2df7d224e 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: release_cred.c 20753 2007-05-31 22:50:06Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_release_cred
            (OM_uint32 * minor_status,
index 80b91930fd37b71832adfed5c07a6f0138add3c5..e2ff9dde31de64ecfc0a091a3e9a323f94ba5226 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: release_name.c 21128 2007-06-18 20:26:50Z lha $");
+RCSID("$Id$");
 
 OM_uint32 _gsskrb5_release_name
            (OM_uint32 * minor_status,
old mode 100755 (executable)
new mode 100644 (file)
index 677a3c8..b40fe52
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: sequence.c 18334 2006-10-07 22:16:04Z lha $");
+RCSID("$Id$");
 
 #define DEFAULT_JITTER_WINDOW 20
 
@@ -255,16 +255,16 @@ _gssapi_msg_order_import(OM_uint32 *minor_status,
     kret = krb5_ret_int32(sp, &flags);
     if (kret)
        goto failed;
-    ret = krb5_ret_int32(sp, &start);
+    kret = krb5_ret_int32(sp, &start);
     if (kret)
        goto failed;
-    ret = krb5_ret_int32(sp, &length);
+    kret = krb5_ret_int32(sp, &length);
     if (kret)
        goto failed;
-    ret = krb5_ret_int32(sp, &jitter_window);
+    kret = krb5_ret_int32(sp, &jitter_window);
     if (kret)
        goto failed;
-    ret = krb5_ret_int32(sp, &first_seq);
+    kret = krb5_ret_int32(sp, &first_seq);
     if (kret)
        goto failed;
     
index 8c554fb8e0f54a3b340c9e303bed6d468f1e6b80..e47e6fdb6ce0bcfda6939edaeec0bec96f9ece7c 100644 (file)
@@ -32,7 +32,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: set_cred_option.c 23331 2008-06-27 12:01:48Z lha $");
+RCSID("$Id$");
 
 /* 1.2.752.43.13.17 */
 static gss_OID_desc gss_krb5_cred_no_ci_flags_x_oid_desc =
index fd76838af514688bf8d61dcd8eb1e74f96501128..f28d2397be5d27bfcc3a26f9120158ef30f07759 100644 (file)
@@ -36,7 +36,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: set_sec_context_option.c 23420 2008-07-26 18:37:48Z lha $");
+RCSID("$Id$");
 
 static OM_uint32
 get_bool(OM_uint32 *minor_status,
index eec4078a706017102c3a12e63a0072e84de13283..727bbf7403bdc9176749aad4b2ef76a0bb7afec0 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: unwrap.c 23112 2008-04-27 18:51:26Z lha $");
+RCSID("$Id$");
 
 static OM_uint32
 unwrap_des
@@ -59,10 +59,17 @@ unwrap_des
   OM_uint32 ret;
   int cstate;
   int cmp;
+  int token_len;
+
+  if (IS_DCE_STYLE(context_handle)) {
+     token_len = 22 + 8 + 15; /* 45 */
+  } else {
+     token_len = input_message_buffer->length;
+  }
 
   p = input_message_buffer->value;
   ret = _gsskrb5_verify_header (&p,
-                                  input_message_buffer->length,
+                                  token_len,
                                   "\x02\x01",
                                   GSS_KRB5_MECHANISM);
   if (ret)
@@ -105,12 +112,17 @@ unwrap_des
       memset (deskey, 0, sizeof(deskey));
       memset (&schedule, 0, sizeof(schedule));
   }
-  /* check pad */
-  ret = _gssapi_verify_pad(input_message_buffer, 
-                          input_message_buffer->length - len,
-                          &padlength);
-  if (ret)
-      return ret;
+
+  if (IS_DCE_STYLE(context_handle)) {
+    padlength = 0;
+  } else {
+    /* check pad */
+    ret = _gssapi_verify_pad(input_message_buffer,
+                            input_message_buffer->length - len,
+                            &padlength);
+    if (ret)
+        return ret;
+  }
 
   MD5_Init (&md5);
   MD5_Update (&md5, p - 24, 8);
@@ -195,10 +207,17 @@ unwrap_des3
   krb5_crypto crypto;
   Checksum csum;
   int cmp;
+  int token_len;
+
+  if (IS_DCE_STYLE(context_handle)) {
+     token_len = 34 + 8 + 15; /* 57 */
+  } else {
+     token_len = input_message_buffer->length;
+  }
 
   p = input_message_buffer->value;
   ret = _gsskrb5_verify_header (&p,
-                                  input_message_buffer->length,
+                                  token_len,
                                   "\x02\x01",
                                   GSS_KRB5_MECHANISM);
   if (ret)
@@ -245,12 +264,17 @@ unwrap_des3
       memcpy (p, tmp.data, tmp.length);
       krb5_data_free(&tmp);
   }
-  /* check pad */
-  ret = _gssapi_verify_pad(input_message_buffer, 
-                          input_message_buffer->length - len,
-                          &padlength);
-  if (ret)
-      return ret;
+
+  if (IS_DCE_STYLE(context_handle)) {
+    padlength = 0;
+  } else {
+    /* check pad */
+    ret = _gssapi_verify_pad(input_message_buffer,
+                            input_message_buffer->length - len,
+                            &padlength);
+    if (ret)
+        return ret;
+  }
 
   /* verify sequence number */
   
index 560c14bc89560d442c6c86fffc9983d98ea63214..df71f8f7d1e54d21b986cd7e7f746121ccd4faad 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: verify_mic.c 23112 2008-04-27 18:51:26Z lha $");
+RCSID("$Id$");
 
 static OM_uint32
 verify_mic_des
index 6d00f2adcfbadf708d1b43e397cdd4b371e0fd42..ecd4f7cd54e27481e59f4b2cc096bdf2f365cd26 100644 (file)
@@ -33,7 +33,7 @@
 
 #include "krb5/gsskrb5_locl.h"
 
-RCSID("$Id: wrap.c 23316 2008-06-23 04:32:32Z lha $");
+RCSID("$Id$");
 
 /*
  * Return initiator subkey, or if that doesn't exists, the subkey.
@@ -210,10 +210,19 @@ wrap_des
   int32_t seq_number;
   size_t len, total_len, padlength, datalen;
 
-  padlength = 8 - (input_message_buffer->length % 8);
-  datalen = input_message_buffer->length + padlength + 8;
-  len = datalen + 22;
-  _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
+  if (IS_DCE_STYLE(ctx)) {
+    padlength = 0;
+    datalen = input_message_buffer->length;
+    len = 22 + 8;
+    _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
+    total_len += datalen;
+    datalen += 8;
+  } else {
+    padlength = 8 - (input_message_buffer->length % 8);
+    datalen = input_message_buffer->length + padlength + 8;
+    len = datalen + 22;
+    _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
+  }
 
   output_message_buffer->length = total_len;
   output_message_buffer->value  = malloc (total_len);
@@ -336,10 +345,19 @@ wrap_des3
   Checksum cksum;
   krb5_data encdata;
 
-  padlength = 8 - (input_message_buffer->length % 8);
-  datalen = input_message_buffer->length + padlength + 8;
-  len = datalen + 34;
-  _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
+  if (IS_DCE_STYLE(ctx)) {
+    padlength = 0;
+    datalen = input_message_buffer->length;
+    len = 34 + 8;
+    _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
+    total_len += datalen;
+    datalen += 8;
+  } else {
+    padlength = 8 - (input_message_buffer->length % 8);
+    datalen = input_message_buffer->length + padlength + 8;
+    len = datalen + 34;
+    _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
+  }
 
   output_message_buffer->length = total_len;
   output_message_buffer->value  = malloc (total_len);
index 926630c42dcd0c41742ec73c39c6102ba3a2d5e6..bfb303ac8ed79978e8653dd13b205a5c1da55558 100644 (file)
@@ -1,7 +1,7 @@
 #include "mech/mech_locl.h"
 #include "heim_threads.h"
 
-RCSID("$Id: context.c 22600 2008-02-21 12:46:24Z lha $");
+RCSID("$Id$");
 
 struct mg_thread_ctx {
     gss_OID mech;
@@ -74,8 +74,14 @@ _gss_mg_get_error(const gss_OID mech, OM_uint32 type,
     if (mg == NULL)
        return GSS_S_BAD_STATUS;
 
+#if 0
+    /* 
+     * We cant check the mech here since a pseudo-mech might have
+     * called an lower layer and then the mech info is all broken
+     */
     if (mech != NULL && gss_oid_equal(mg->mech, mech) == 0)
        return GSS_S_BAD_STATUS;
+#endif
 
     switch (type) {
     case GSS_C_GSS_CODE: {
index 24e529864d6116a55d2e222893b3b0c8480aad96..f2a7009cdad4b0ebd176eb43df83041462756acf 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/lib/libgssapi/context.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
- *     $Id: context.h 19925 2007-01-16 10:19:27Z lha $
+ *     $Id$
  */
 
 #include <gssapi_mech.h>
index 7f77b8a68e2efe9a77e71bef1ffd660c9aeb9e64..01bd882ddaa24076b309853f186fedaadd10a29e 100644 (file)
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *     $FreeBSD: src/lib/libgssapi/cred.h,v 1.1 2005/12/29 14:40:20 dfr Exp $
- *     $Id: cred.h 20626 2007-05-08 13:56:49Z lha $
+ *     $Id$
  */
 
 struct _gss_mechanism_cred {
index a6b1ded5cad50141e959fab969f8903432ebd462..5fa102193ecd9816d298dfa5f8f7754d72fdf9de 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_accept_sec_context.c 22071 2007-11-14 20:04:50Z lha $");
+RCSID("$Id$");
 
 static OM_uint32
 parse_header(const gss_buffer_t input_token, gss_OID mech_oid)
@@ -151,14 +151,13 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status,
     OM_uint32 *time_rec,
     gss_cred_id_t *delegated_cred_handle)
 {
-       OM_uint32 major_status, mech_ret_flags;
+       OM_uint32 major_status, mech_ret_flags, junk;
        gssapi_mech_interface m;
        struct _gss_context *ctx = (struct _gss_context *) *context_handle;
        struct _gss_cred *cred = (struct _gss_cred *) acceptor_cred_handle;
        struct _gss_mechanism_cred *mc;
        gss_cred_id_t acceptor_mc, delegated_mc;
        gss_name_t src_mn;
-       int allocated_ctx;
 
        *minor_status = 0;
        if (src_name)
@@ -200,18 +199,19 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status,
                        free(ctx);
                        return (GSS_S_BAD_MECH);
                }
-               allocated_ctx = 1;
+               *context_handle = (gss_ctx_id_t) ctx;
        } else {
                m = ctx->gc_mech;
-               allocated_ctx = 0;
        }
 
        if (cred) {
                SLIST_FOREACH(mc, &cred->gc_mc, gmc_link)
                        if (mc->gmc_mech == m)
                                break;
-               if (!mc)
+               if (!mc) {
+                       gss_delete_sec_context(&junk, context_handle, NULL);
                        return (GSS_S_BAD_MECH);
+               }
                acceptor_mc = mc->gmc_cred;
        } else {
                acceptor_mc = GSS_C_NO_CREDENTIAL;
@@ -234,6 +234,7 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status,
            major_status != GSS_S_CONTINUE_NEEDED)
        {
                _gss_mg_error(m, major_status, *minor_status);
+               gss_delete_sec_context(&junk, context_handle, NULL);
                return (major_status);
        }
 
@@ -245,11 +246,12 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status,
 
                if (!name) {
                        m->gm_release_name(minor_status, &src_mn);
+                       gss_delete_sec_context(&junk, context_handle, NULL);
                        return (GSS_S_FAILURE);
                }
                *src_name = (gss_name_t) name;
        } else if (src_mn) {
-           m->gm_release_name(minor_status, &src_mn);
+               m->gm_release_name(minor_status, &src_mn);
        }
 
        if (mech_ret_flags & GSS_C_DELEG_FLAG) {
@@ -263,6 +265,7 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status,
                        dcred = malloc(sizeof(struct _gss_cred));
                        if (!dcred) {
                                *minor_status = ENOMEM;
+                               gss_delete_sec_context(&junk, context_handle, NULL);
                                return (GSS_S_FAILURE);
                        }
                        SLIST_INIT(&dcred->gc_mc);
@@ -270,6 +273,7 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status,
                        if (!dmc) {
                                free(dcred);
                                *minor_status = ENOMEM;
+                               gss_delete_sec_context(&junk, context_handle, NULL);
                                return (GSS_S_FAILURE);
                        }
                        dmc->gmc_mech = m;
@@ -283,6 +287,5 @@ OM_uint32 gss_accept_sec_context(OM_uint32 *minor_status,
 
        if (ret_flags)
            *ret_flags = mech_ret_flags;
-       *context_handle = (gss_ctx_id_t) ctx;
        return (major_status);
 }
index a2757140ae24db293fd34cbfff0fb6f692ecaa45..b21b3f62e842406de97c2edeec70fe6adf90c9b7 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_acquire_cred.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_acquire_cred(OM_uint32 *minor_status,
index 49efa20c8beba2e71282a2ea4c704fc227e06f30..d1908528842b44254cb15da7cea0d24b45b390a3 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_add_cred.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 static struct _gss_mechanism_cred *
 _gss_copy_cred(struct _gss_mechanism_cred *mc)
index d89adbf63a3de5c0d6dc13a26ac0abdd01356b06..1214e72fa972657e99226b9ad3454d6db0f192f3 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_add_oid_set_member.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_add_oid_set_member (OM_uint32 * minor_status,
index 091e219367981ce3ba3bf26ba236555ea5b9c6a0..9f0bb4cce3ff71820c231aeb9b9199da427a7cee 100644 (file)
@@ -31,7 +31,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_buffer_set.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_create_empty_buffer_set
index d242c56a909b275bdaa168bb133b94c7cbfaeba0..91a08fb2bcb3e6d6352b1e10bf1a54a1c4222d2f 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_canonicalize_name.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_canonicalize_name(OM_uint32 *minor_status,
@@ -38,7 +38,7 @@ gss_canonicalize_name(OM_uint32 *minor_status,
        OM_uint32 major_status;
        struct _gss_name *name = (struct _gss_name *) input_name;
        struct _gss_mechanism_name *mn;
-       gssapi_mech_interface m = __gss_get_mechanism(mech_type);
+       gssapi_mech_interface m;
        gss_name_t new_canonical_name;
 
        *minor_status = 0;
index 1eb7625ee2820258281df75e883541af6652bc7a..3f2d0013c50045fca33bc17e3390e1d62d9032ca 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_compare_name.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_compare_name(OM_uint32 *minor_status,
index 8dce822a9fc9f09126f31d07578a08f0577271ff..df89612060e7399183baa9d4bfc99a3315a3d1e8 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_context_time.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_context_time(OM_uint32 *minor_status,
index 8dd35273492557e507a9f797a991ee7cfeee6916..8858f284986913682a3eeb65069e8f3e299d42b5 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_create_empty_oid_set.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_create_empty_oid_set(OM_uint32 *minor_status,
index 8f939255850488b1ba5570411166f443227ccf46..6dba77e41045cc8a301c8597ab569f5470401d62 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_decapsulate_token.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_decapsulate_token(gss_buffer_t input_token,
index 91273bcf5687ae93cac2aca1510230a227328a81..96abae6b33ab56bb5d128656b18a9944bc7420e7 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_delete_sec_context.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_delete_sec_context(OM_uint32 *minor_status,
index 0d8240024648a30e22bdf6a37426e213338d4eee..d720ffe8805145e4c841d82813cc2388e4d88a9b 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_display_name.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_display_name(OM_uint32 *minor_status,
index 5bbc89b1ece37477353f3a41db31ed9c3a8d9ca2..7a91af2abc92de2f9d76ab20ccc81b3abeb56c1e 100644 (file)
@@ -59,7 +59,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_display_status.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 static const char *
 calling_error(OM_uint32 v)
index f38c840b314c53619bfd4ea02f488ac917be6f6a..6912e3329fc50b79b31a0d303a6f2a5d5480eb5b 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_duplicate_name.c 21480 2007-07-10 16:32:32Z lha $");
+RCSID("$Id$");
 
 OM_uint32 gss_duplicate_name(OM_uint32 *minor_status,
     const gss_name_t src_name,
index d111a0ed6189ec8cb463be2e3d4d86c52a9e09f0..59bd797766ef3defd628cb1f4011f1ca159f4db6 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_duplicate_oid.c 19954 2007-01-17 11:50:23Z lha $");
+RCSID("$Id$");
 
 OM_uint32 gss_duplicate_oid (
         OM_uint32 *minor_status,
index 32ecbbacb2d6512530c78551d98c8f9eeed245f1..b9d06c28fa2805e7f76e286ae5124838e0e2c624 100644 (file)
@@ -32,7 +32,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_encapsulate_token.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_encapsulate_token(gss_buffer_t input_token,
index 22053202aa86048be00cfbea5ad192270837cc0b..7c1e6791da9a07dce947fa5c74b6c2fc587e06e6 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_export_name.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_export_name(OM_uint32 *minor_status,
index 053d203ba16ecf14b62df8942d6209ac61c44ca4..f3a6dc4fb57b42103508dee0e3eb067fe9fbc99d 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_export_sec_context.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_export_sec_context(OM_uint32 *minor_status,
index 7b33ac0ed9e325f26223b04da4aa5d353e070d7a..9cd5060fc941bf7e9786d1410093b1571a096243 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_get_mic.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_get_mic(OM_uint32 *minor_status,
index 104452f5b95e27d6e19602ecca0d802f44adcc36..040e2284105b95c2046decf4a204a7defd96097d 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_import_name.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 static OM_uint32
 _gss_import_export_name(OM_uint32 *minor_status,
index c68849ce008b245ac7cb0646e3dc5fc185d13602..01ca9f10df944eba14688d5a7217b678b438beee 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_import_sec_context.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_import_sec_context(OM_uint32 *minor_status,
index cafb6609914cace3c6a7e504c4f3350922459be3..34c0bb55d8325dba37b42a22ca71aaf90b9a2e11 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_indicate_mechs.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_indicate_mechs(OM_uint32 *minor_status,
index d0e92f41cebc03e8ba4bdf90254cfa1b7693a94a..579000a7ec46c19a76c172ab1bdb5918f6c293d6 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_init_sec_context.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 static gss_cred_id_t
 _gss_mech_cred_find(gss_cred_id_t cred_handle, gss_OID mech_type)
index 26f4038071208d687c0be6dbe9d1f4f1c1039e77..8872f121d0495ce787201216653744cc75ff4da5 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_inquire_context.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_inquire_context(OM_uint32 *minor_status,
index 1610be5538723277082283587694ace7336871f4..358757267248084205f08ae402994274a644292c 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_inquire_cred.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 #define AUSAGE 1
 #define IUSAGE 2
index fedd963ffa4cb647472a043b2451f41ec07ea5b0..47a2eaf27998a82d1a0eb27175002213123aad63 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_inquire_cred_by_mech.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_inquire_cred_by_mech(OM_uint32 *minor_status,
index c1bbf3a724f8ddc67ecb9e0c3bad1d8e39a9a35c..d22231d96b5aedbc0f73d2d2e9d8993ed9087f7c 100644 (file)
@@ -31,7 +31,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_inquire_cred_by_oid.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_inquire_cred_by_oid (OM_uint32 *minor_status,
index 6b06a33053da1b1ad9052fb3cb12fb1f0c56bbcf..8df7f88a0a5065a9c6c07770bd3f01ad9791c76b 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_inquire_mechs_for_name.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_inquire_mechs_for_name(OM_uint32 *minor_status,
index 1ba1ee056336cd77efe97cfb39de1ef4f6d6c019..a630d762161a7c3fd981073342017a2329b99653 100644 (file)
@@ -27,7 +27,7 @@
  */
 
 #include "mech_locl.h"
-RCSID("$Id: gss_inquire_names_for_mech.c 23025 2008-04-17 10:01:57Z lha $");
+RCSID("$Id$");
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_inquire_names_for_mech(OM_uint32 *minor_status,