Move definitions of struct krb5_rc_st, struct _krb5_rc_ops, krb5_rc_ops, and

declarations of krb5_rc_register_type, krb5_rc_dfl_ops from k5-int.h to
rc-int.h.  Include rc-int.h in the krb5/rcache files that need it.

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

2 files changed, 7 insertions, 38 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 22fb03879c..87707074e8 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-02  Ken Raeburn  <raeburn@mit.edu>
+
+	* k5-int.h (struct krb5_rc_st, struct _krb5_rc_ops, krb5_rc_ops):
+	Move type definitions to rc-int.h.
+	(krb5_rc_register_type, krb5_rc_dfl_ops): Move declarations to
+	rc-int.h.
+
 2004-05-30  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-int.h (krb5int_crypto_init, krb5int_prng_init): Declare.
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 413fc60873..67fb028eb4 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1806,15 +1806,6 @@ struct _krb5_cc_ops {
 
 extern const krb5_cc_ops *krb5_cc_dfl_ops;
 
-/* And this should be in lib/krb5/rcache somewhere.  */
-
-struct krb5_rc_st {
-    krb5_magic magic;
-    const struct _krb5_rc_ops *ops;
-    krb5_pointer data;
-    k5_mutex_t lock;
-};
-
 typedef struct _krb5_donot_replay {
     krb5_magic magic;
     krb5_ui_4 hash;
@@ -1865,35 +1856,6 @@ char *KRB5_CALLCONV krb5_rc_get_name
 krb5_error_code KRB5_CALLCONV krb5_rc_resolve
 	(krb5_context, krb5_rcache, char *);
 
-struct _krb5_rc_ops {
-    krb5_magic magic;
-    char *type;
-    krb5_error_code (KRB5_CALLCONV *init)
-	(krb5_context, krb5_rcache,krb5_deltat); /* create */
-    krb5_error_code (KRB5_CALLCONV *recover)
-	(krb5_context, krb5_rcache); /* open */
-    krb5_error_code (KRB5_CALLCONV *destroy)
-	(krb5_context, krb5_rcache);
-    krb5_error_code (KRB5_CALLCONV *close)
-	(krb5_context, krb5_rcache);
-    krb5_error_code (KRB5_CALLCONV *store)
-	(krb5_context, krb5_rcache,krb5_donot_replay *);
-    krb5_error_code (KRB5_CALLCONV *expunge)
-	(krb5_context, krb5_rcache);
-    krb5_error_code (KRB5_CALLCONV *get_span)
-	(krb5_context, krb5_rcache,krb5_deltat *);
-    char *(KRB5_CALLCONV *get_name)
-	(krb5_context, krb5_rcache);
-    krb5_error_code (KRB5_CALLCONV *resolve)
-	(krb5_context, krb5_rcache, char *);
-};
-
-typedef struct _krb5_rc_ops krb5_rc_ops;
-
-krb5_error_code krb5_rc_register_type (krb5_context, const krb5_rc_ops *);
-
-extern const krb5_rc_ops krb5_rc_dfl_ops;
-
 typedef struct _krb5_kt_ops {
     krb5_magic magic;
     char *prefix;