* func-proto.h (krb5_get_in_tkt()) Changed key_proc args to be the

		following (krb5_context, const krb5_keytype, krb5_data *,
                krb5_const_pointer, krb5_keyblock **)

	* func-proto.h (krb5_get_in_tkt_*()) Removed krb5_keytype, changed
		krb5_enctype to krb5_enctype *, changed krb5_preauthtype to
		krb5_preauthtype *.

	* func-proto.h Added new routine krb5_get_in_tkt_with_keytab().

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4919 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 045a9826502535dfcf087ad5845e9f8f7a82fa35..8af0446429cd5d6e6ba4a9fb15a536bc911d9214 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,15 @@
+Mon Feb 06 17:19:04 1995 Chris Provenzano  (proven@mit.edu)
+
+       * func-proto.h (krb5_get_in_tkt()) Changed key_proc args to be the
+               following (krb5_context, const krb5_keytype, krb5_data *,
+                krb5_const_pointer, krb5_keyblock **)
+
+       * func-proto.h (krb5_get_in_tkt_*()) Removed krb5_keytype, changed
+               krb5_enctype to krb5_enctype *, changed krb5_preauthtype to
+               krb5_preauthtype *.
+
+       * func-proto.h Added new routine krb5_get_in_tkt_with_keytab().
+
 Fri Feb  3 07:57:31 1995  Theodore Y. Ts'o  (tytso@dcl)
 
        * configure.in: Use politically correct name of AC_CHECK_SIZEOF

diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index a8d2cf580ba363bf9ec961932c02333859d284a1..bd7bb6832f4c13847c4adb84733aa0b89b829917 100644 (file)
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -437,14 +437,13 @@ krb5_error_code krb5_get_in_tkt
        PROTOTYPE((krb5_context,
                   const krb5_flags,
                   krb5_address * const *,
-                  const krb5_preauthtype,
-                  const krb5_enctype,
-                  const krb5_keytype,
+                  krb5_enctype *,
+                  krb5_preauthtype *,
                   krb5_error_code (* )(krb5_context,
                                        const krb5_keytype,
-                                        krb5_keyblock **,
+                                        krb5_data *,
                                         krb5_const_pointer,
-                                        krb5_pa_data **),
+                                        krb5_keyblock **),
                   krb5_const_pointer,
                   krb5_error_code (* )(krb5_context,
                                        const krb5_keyblock *,
@@ -459,9 +458,8 @@ krb5_error_code krb5_get_in_tkt_with_password
        PROTOTYPE((krb5_context,
                   const krb5_flags,
                   krb5_address * const *,
-                  const krb5_preauthtype pre_auth_type,
-                  const krb5_enctype,
-                  const krb5_keytype,
+                  krb5_enctype *,
+                  krb5_preauthtype *,
                   const char *,
                   krb5_ccache,
                   krb5_creds *,
@@ -471,19 +469,30 @@ krb5_error_code krb5_get_in_tkt_with_skey
        PROTOTYPE((krb5_context,
                   const krb5_flags,
                   krb5_address * const *,
-                  const krb5_preauthtype pre_auth_type,
-                  const krb5_enctype,
+                  krb5_enctype *,
+                  krb5_preauthtype *,
                   const krb5_keyblock *,
                   krb5_ccache,
                   krb5_creds *,
                   krb5_kdc_rep ** ));
 
+krb5_error_code krb5_get_in_tkt_with_keytab
+       PROTOTYPE((krb5_context,
+                  const krb5_flags,
+                  krb5_address * const *,
+                  krb5_enctype *,
+                  krb5_preauthtype *,
+                  const krb5_keytab,
+                  krb5_ccache,
+                  krb5_creds *,
+                  krb5_kdc_rep ** ));
+
+
 krb5_error_code krb5_decode_kdc_rep
        PROTOTYPE((krb5_context,
                   krb5_data *,
                   const krb5_keyblock *,
                   const krb5_enctype,
-
                   krb5_kdc_rep ** ));
 
 typedef krb5_error_code (*krb5_rdreq_key_proc) PROTOTYPE((krb5_context,