From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 16 Nov 2009 01:49:21 +0000 (+0000)
Subject: Move prototypes for krb5int_send_tgs and krb5int_decode_tgs_rep to int-proto.h.
X-Git-Tag: krb5-1.8-alpha1~180
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1cfc10df16d9319405fd101c21bf328515fa3a3;p=krb5.git

Move prototypes for krb5int_send_tgs and krb5int_decode_tgs_rep to int-proto.h.
These functions are not exported by the library.

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index b88239b12..beb13f964 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -2672,27 +2672,6 @@ krb5_error_code krb5_set_config_files(krb5_context, const char **);
 krb5_error_code KRB5_CALLCONV krb5_get_default_config_files(char ***filenames);
 
 void KRB5_CALLCONV krb5_free_config_files(char **filenames);
-krb5_error_code krb5int_send_tgs(krb5_context, krb5_flags,
-                                 const krb5_ticket_times *,
-                                 const krb5_enctype *,
-                                 krb5_const_principal, krb5_address *const *,
-                                 krb5_authdata *const *,
-                                 krb5_pa_data *const *, const krb5_data *,
-                                 krb5_creds *,
-                                 krb5_error_code (*gcvt_fct)(krb5_context,
-                                                             krb5_keyblock *,
-                                                             krb5_kdc_req *,
-                                                             void *),
-                                 void *gcvt_data, krb5_response *,
-                                 krb5_keyblock **subkey);
-/* The subkey field is an output parameter; if a
- * tgs-rep is received then the subkey will be filled
- * in with the subkey needed to decrypt the TGS
- * response. Otherwise it will be set to null.
- */
-krb5_error_code krb5int_decode_tgs_rep(krb5_context, krb5_data *,
-                                       const krb5_keyblock *, krb5_keyusage,
-                                       krb5_kdc_rep ** );
 
 krb5_error_code krb5int_find_authdata(krb5_context context,
                                       krb5_authdata *const *ticket_authdata,
diff --git a/src/lib/krb5/krb/decode_kdc.c b/src/lib/krb5/krb/decode_kdc.c
index 19451eea4..f998a4676 100644
--- a/src/lib/krb5/krb/decode_kdc.c
+++ b/src/lib/krb5/krb/decode_kdc.c
@@ -29,6 +29,7 @@
  */
 
 #include "k5-int.h"
+#include "int-proto.h"
 
 /*
   Takes a KDC_REP message and decrypts encrypted part using etype and
diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index 081a8a34b..44ea69d4e 100644
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -32,15 +32,13 @@
 #ifndef KRB5_INT_FUNC_PROTO__
 #define KRB5_INT_FUNC_PROTO__
 
-krb5_error_code krb5_tgtname
-(krb5_context context,
- const krb5_data *,
- const krb5_data *,
- krb5_principal *);
+krb5_error_code
+krb5_tgtname(krb5_context context, const krb5_data *, const krb5_data *,
+             krb5_principal *);
 
-krb5_error_code krb5_libdefault_boolean
-(krb5_context, const krb5_data *, const char *,
- int *);
+krb5_error_code
+krb5_libdefault_boolean(krb5_context, const krb5_data *, const char *,
+                        int *);
 
 krb5_error_code krb5_ser_authdata_init (krb5_context);
 krb5_error_code krb5_ser_address_init (krb5_context);
@@ -87,4 +85,26 @@ krb5_get_cred_via_tkt_ext (krb5_context context, krb5_creds *tkt,
                            krb5_creds **out_cred,
                            krb5_keyblock **out_subkey);
 
+krb5_error_code krb5int_send_tgs(krb5_context, krb5_flags,
+                                 const krb5_ticket_times *,
+                                 const krb5_enctype *,
+                                 krb5_const_principal, krb5_address *const *,
+                                 krb5_authdata *const *,
+                                 krb5_pa_data *const *, const krb5_data *,
+                                 krb5_creds *,
+                                 krb5_error_code (*gcvt_fct)(krb5_context,
+                                                             krb5_keyblock *,
+                                                             krb5_kdc_req *,
+                                                             void *),
+                                 void *gcvt_data, krb5_response *,
+                                 krb5_keyblock **subkey);
+/* The subkey field is an output parameter; if a
+ * tgs-rep is received then the subkey will be filled
+ * in with the subkey needed to decrypt the TGS
+ * response. Otherwise it will be set to null.
+ */
+krb5_error_code krb5int_decode_tgs_rep(krb5_context, krb5_data *,
+                                       const krb5_keyblock *, krb5_keyusage,
+                                       krb5_kdc_rep ** );
+
 #endif /* KRB5_INT_FUNC_PROTO__ */
diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c
index 398855009..bee982b08 100644
--- a/src/lib/krb5/krb/send_tgs.c
+++ b/src/lib/krb5/krb/send_tgs.c
@@ -29,6 +29,7 @@
  */
 
 #include "k5-int.h"
+#include "int-proto.h"
 
 /*
   Constructs a TGS request