more promotion rule changes

rearrange & clean up the ticket/kdc_rep prototypes

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

diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index 001a57260f0934ae665d09e4833ce96d4854a853..aaae9724bc7546418239d86be096116147df1bd1 100644 (file)
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -19,28 +19,30 @@
 
 /* libkrb.spec */
 krb5_error_code krb5_encode_kdc_rep
-       PROTOTYPE((int,
+       PROTOTYPE((int,                 /* promotion rules require this */
                   krb5_kdc_rep *,
                   krb5_enc_kdc_rep_part *,
                   krb5_keyblock *,
                   krb5_data ** ));
-krb5_error_code krb5_decode_ticket
+krb5_error_code krb5_decode_kdc_rep
        PROTOTYPE((krb5_data *,
                   krb5_keyblock *,
-                  krb5_enctype,
-                  krb5_ticket ** ));
+                  int,                 /* promotion rules require this */
+                  krb5_kdc_rep ** ));
 krb5_error_code krb5_encode_ticket
        PROTOTYPE((krb5_ticket *,
                   krb5_data ** ));
-krb5_error_code krb5_encrypt_tkt_part
-       PROTOTYPE((krb5_enc_tkt_part *,
-                  krb5_keyblock *,
-                  krb5_ticket * ));
-krb5_error_code krb5_decode_kdc_rep
+krb5_error_code krb5_decode_ticket
        PROTOTYPE((krb5_data *,
                   krb5_keyblock *,
                   krb5_enctype,
-                  krb5_kdc_rep ** ));
+                  krb5_ticket ** ));
+krb5_error_code krb5_encrypt_tkt_part
+       PROTOTYPE((krb5_keyblock *,
+                  krb5_ticket * ));
+krb5_error_code krb5_decrypt_tkt_part
+       PROTOTYPE((krb5_keyblock *,
+                  krb5_ticket * ));
 krb5_error_code krb5_send_tgs
        PROTOTYPE((krb5_flags,
                   krb5_ticket_times *,