From: Ezra Peisach <epeisach@mit.edu>
Date: Fri, 15 Aug 2008 18:46:12 +0000 (+0000)
Subject: Move prototype for krb5int_random_string from k5-int.h to cc-int.h as
X-Git-Tag: krb5-1.7-alpha1~487
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ac687b64e61a5ab5a0874d32105d03a12304d30;p=krb5.git

Move prototype for krb5int_random_string from k5-int.h to cc-int.h as
it is private to the ccache code. Include cc-int.h where needed, and
update Makefile.in dependencies.

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index b9abd8a34..76c2ba0f4 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1762,8 +1762,6 @@ krb5_error_code
 krb5int_generate_and_save_subkey (krb5_context, krb5_auth_context,
 				  krb5_keyblock * /* Old keyblock, not new!  */);
 
-krb5_error_code krb5int_random_string (krb5_context, char *, unsigned int);
-
 /* set and change password helpers */
 
 krb5_error_code krb5int_mk_chpw_req
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 360b6cf44..208ae651a 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -189,7 +189,7 @@ cc_memory.so cc_memory.po $(OUTPRE)cc_memory.$(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 cc_memory.c
+  $(SRCTOP)/include/socket-utils.h cc-int.h cc_memory.c
 cc_keyring.so cc_keyring.po $(OUTPRE)cc_keyring.$(OBJEXT): \
   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
@@ -198,7 +198,7 @@ cc_keyring.so cc_keyring.po $(OUTPRE)cc_keyring.$(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 cc_keyring.c
+  $(SRCTOP)/include/socket-utils.h cc-int.h cc_keyring.c
 ccfns.so ccfns.po $(OUTPRE)ccfns.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(SRCTOP)/include/k5-err.h \
diff --git a/src/lib/krb5/ccache/cc-int.h b/src/lib/krb5/ccache/cc-int.h
index 430e4c375..2978ed9fb 100644
--- a/src/lib/krb5/ccache/cc-int.h
+++ b/src/lib/krb5/ccache/cc-int.h
@@ -42,6 +42,8 @@ krb5int_cc_initialize(void);
 void
 krb5int_cc_finalize(void);
 
+krb5_error_code krb5int_random_string (krb5_context, char *, unsigned int);
+
 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/cc_keyring.c b/src/lib/krb5/ccache/cc_keyring.c
index d892584fe..be22a8365 100644
--- a/src/lib/krb5/ccache/cc_keyring.c
+++ b/src/lib/krb5/ccache/cc_keyring.c
@@ -70,7 +70,7 @@
  *	  special key, which is not counted in the 'numkeys' count
  */
 
-#include "k5-int.h"
+#include "cc-int.h"
 
 #ifdef USE_KEYRING_CCACHE
 
diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c
index 0014407c7..dc0fd3422 100644
--- a/src/lib/krb5/ccache/cc_memory.c
+++ b/src/lib/krb5/ccache/cc_memory.c
@@ -26,7 +26,7 @@
  *
  * implementation of memory-based credentials cache
  */
-#include "k5-int.h"
+#include "cc-int.h"
 #include <errno.h>
 
 static krb5_error_code KRB5_CALLCONV krb5_mcc_close