* krb5.hin (struct _krb5_donot_replay, krb5_rc_default, krb5_rc_resolve_type)

(krb5_rc_resolve_full, krb5_rc_get_type, krb5_rc_default_type)
(krb5_rc_default_name, krb5_auth_to_rep): Private declarations moved...
* k5-int.h: ...to here.

ticket: 1784
status: open

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 5502f2e9521afb9c510540b87b4bfb28849eb30d..bbc9bdce641e98be3b5fb458e253ae5efa4f0c4d 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,5 +1,11 @@
 2003-08-26  Ken Raeburn  <raeburn@mit.edu>
 
+       * krb5.hin (struct _krb5_donot_replay, krb5_rc_default)
+       (krb5_rc_resolve_type, krb5_rc_resolve_full, krb5_rc_get_type)
+       (krb5_rc_default_type, krb5_rc_default_name, krb5_auth_to_rep):
+       Private declarations moved...
+       * k5-int.h: ...to here.
+
        * configure.in: Don't test for labs, memmove or bcopy.
        * k5-int.h (labs, HAVE_LABS): Never define.
        * win-mac.h (HAVE_LABS): Don't define.

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index ba1674a7e6c6c6b8b243d3fa071925174dca660a..0cb1aeecb7ac35c4f63e34ce503612d4972aa770 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1771,6 +1771,56 @@ struct krb5_rc_st {
     krb5_pointer data;
 };
 
+typedef struct _krb5_donot_replay {
+    krb5_magic magic;
+    krb5_ui_4 hash;
+    char *server;                      /* null-terminated */
+    char *client;                      /* null-terminated */
+    krb5_int32 cusec;
+    krb5_timestamp ctime;
+} krb5_donot_replay;
+
+krb5_error_code krb5_rc_default 
+       (krb5_context,
+               krb5_rcache *);
+krb5_error_code krb5_rc_resolve_type 
+       (krb5_context,
+               krb5_rcache *,char *);
+krb5_error_code krb5_rc_resolve_full 
+       (krb5_context,
+               krb5_rcache *,char *);
+char * krb5_rc_get_type 
+       (krb5_context,
+               krb5_rcache);
+char * krb5_rc_default_type 
+       (krb5_context);
+char * krb5_rc_default_name 
+       (krb5_context);
+krb5_error_code krb5_auth_to_rep 
+       (krb5_context,
+               krb5_tkt_authent *,
+               krb5_donot_replay *);
+
+
+krb5_error_code KRB5_CALLCONV krb5_rc_initialize
+       (krb5_context, krb5_rcache,krb5_deltat);
+krb5_error_code KRB5_CALLCONV krb5_rc_recover
+       (krb5_context, krb5_rcache);
+krb5_error_code KRB5_CALLCONV krb5_rc_destroy
+       (krb5_context, krb5_rcache);
+krb5_error_code KRB5_CALLCONV krb5_rc_close
+       (krb5_context, krb5_rcache);
+krb5_error_code KRB5_CALLCONV krb5_rc_store
+       (krb5_context, krb5_rcache,krb5_donot_replay *);
+krb5_error_code KRB5_CALLCONV krb5_rc_expunge
+       (krb5_context, krb5_rcache);
+krb5_error_code KRB5_CALLCONV krb5_rc_get_lifespan
+       (krb5_context, krb5_rcache,krb5_deltat *);
+char *KRB5_CALLCONV krb5_rc_get_name
+       (krb5_context, krb5_rcache);
+krb5_error_code KRB5_CALLCONV krb5_rc_resolve
+       (krb5_context, krb5_rcache, char *);
+
 struct _krb5_rc_ops {
     krb5_magic magic;
     char *type;

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index c889bac60b21f091757610598f786b31988e65e6..eae96019129b2b9b9b2b20a169e8d7485b325fa4 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -1268,56 +1268,6 @@ krb5_cc_get_type (krb5_context context, krb5_ccache cache);
 struct krb5_rc_st;
 typedef struct krb5_rc_st *krb5_rcache;
 
-#if KRB5_PRIVATE
-typedef struct _krb5_donot_replay {
-    krb5_magic magic;
-    char *server;                      /* null-terminated */
-    char *client;                      /* null-terminated */
-    krb5_int32 cusec;
-    krb5_timestamp ctime;
-} krb5_donot_replay;
-
-krb5_error_code krb5_rc_default 
-       (krb5_context,
-               krb5_rcache *);
-krb5_error_code krb5_rc_resolve_type 
-       (krb5_context,
-               krb5_rcache *,char *);
-krb5_error_code krb5_rc_resolve_full 
-       (krb5_context,
-               krb5_rcache *,char *);
-char * krb5_rc_get_type 
-       (krb5_context,
-               krb5_rcache);
-char * krb5_rc_default_type 
-       (krb5_context);
-char * krb5_rc_default_name 
-       (krb5_context);
-krb5_error_code krb5_auth_to_rep 
-       (krb5_context,
-               krb5_tkt_authent *,
-               krb5_donot_replay *);
-
-
-krb5_error_code KRB5_CALLCONV krb5_rc_initialize
-       (krb5_context, krb5_rcache,krb5_deltat);
-krb5_error_code KRB5_CALLCONV krb5_rc_recover
-       (krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_destroy
-       (krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_close
-       (krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_store
-       (krb5_context, krb5_rcache,krb5_donot_replay *);
-krb5_error_code KRB5_CALLCONV krb5_rc_expunge
-       (krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_get_lifespan
-       (krb5_context, krb5_rcache,krb5_deltat *);
-char *KRB5_CALLCONV krb5_rc_get_name
-       (krb5_context, krb5_rcache);
-krb5_error_code KRB5_CALLCONV krb5_rc_resolve
-       (krb5_context, krb5_rcache, char *);
-#endif /* KRB5_PRIVATE */
 /*
  * end "rcache.h"
  */