From 809149e75030552759243f2a55471af34622418e Mon Sep 17 00:00:00 2001
From: Ezra Peisach <epeisach@mit.edu>
Date: Sat, 16 Aug 2008 01:14:58 +0000
Subject: [PATCH] Move internal cccursor structures/prototypes to the ccache
 private include file. Functions are not exported from library.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20665 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/k5-int.h            | 20 --------------------
 src/lib/krb5/ccache/Makefile.in |  2 +-
 src/lib/krb5/ccache/cc-int.h    | 21 +++++++++++++++++++++
 src/lib/krb5/ccache/cccursor.c  |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 76c2ba0f4..8f9791bb9 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -2039,26 +2039,6 @@ extern const krb5_cc_ops *krb5_cc_dfl_ops;
 krb5_error_code
 krb5int_cc_os_default_name(krb5_context context, char **name);
 
-/*
- * Cursor for iterating over ccache types
- */
-struct krb5_cc_typecursor;
-typedef struct krb5_cc_typecursor *krb5_cc_typecursor;
-
-krb5_error_code
-krb5int_cc_typecursor_new(krb5_context context, krb5_cc_typecursor *cursor);
-
-krb5_error_code
-krb5int_cc_typecursor_next(
-    krb5_context context,
-    krb5_cc_typecursor cursor,
-    const struct _krb5_cc_ops **ops);
-
-krb5_error_code
-krb5int_cc_typecursor_free(
-    krb5_context context,
-    krb5_cc_typecursor *cursor);
-
 typedef struct _krb5_donot_replay {
     krb5_magic magic;
     krb5_ui_4 hash;
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 208ae651a..835d7e2bd 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -144,7 +144,7 @@ cccursor.so cccursor.po $(OUTPRE)cccursor.$(OBJEXT): \
   $(SRCTOP)/include/k5-plugin.h $(SRCTOP)/include/k5-thread.h \
   $(SRCTOP)/include/krb5.h $(SRCTOP)/include/krb5/locate_plugin.h \
   $(SRCTOP)/include/krb5/preauth_plugin.h $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/include/socket-utils.h cccursor.c
+  $(SRCTOP)/include/socket-utils.h cc-int.h cccursor.c
 ccdefault.so ccdefault.po $(OUTPRE)ccdefault.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
diff --git a/src/lib/krb5/ccache/cc-int.h b/src/lib/krb5/ccache/cc-int.h
index 2978ed9fb..e533f4667 100644
--- a/src/lib/krb5/ccache/cc-int.h
+++ b/src/lib/krb5/ccache/cc-int.h
@@ -44,6 +44,27 @@ krb5int_cc_finalize(void);
 
 krb5_error_code krb5int_random_string (krb5_context, char *, unsigned int);
 
+/*
+ * Cursor for iterating over ccache types
+ */
+struct krb5_cc_typecursor;
+typedef struct krb5_cc_typecursor *krb5_cc_typecursor;
+
+krb5_error_code
+krb5int_cc_typecursor_new(krb5_context context, krb5_cc_typecursor *cursor);
+
+krb5_error_code
+krb5int_cc_typecursor_next(
+    krb5_context context,
+    krb5_cc_typecursor cursor,
+    const struct _krb5_cc_ops **ops);
+
+krb5_error_code
+krb5int_cc_typecursor_free(
+    krb5_context context,
+    krb5_cc_typecursor *cursor);
+
+
 extern k5_mutex_t krb5int_mcc_mutex;
 extern k5_mutex_t krb5int_krcc_mutex;
 extern k5_mutex_t krb5int_cc_file_mutex;
diff --git a/src/lib/krb5/ccache/cccursor.c b/src/lib/krb5/ccache/cccursor.c
index f0ae4a832..31b4737cf 100644
--- a/src/lib/krb5/ccache/cccursor.c
+++ b/src/lib/krb5/ccache/cccursor.c
@@ -26,7 +26,7 @@
  * cursor for sequential traversal of ccaches
  */
 
-#include "k5-int.h"
+#include "cc-int.h"
 
 #include <assert.h>
 
-- 
2.26.2