Pullup from trunk to 1.6 branch

ticket: 4657
version_fixed: 1.6

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18766 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 2ad6be9c8ecab4b861ab2d8131816ed5bceaa40d..081a43ffc259509c753f3a1a58e2273085bc6980 100644 (file)
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -1215,8 +1215,8 @@ typedef struct _krb5_cc_ops krb5_cc_ops;
 /*
  * Cursor for iterating over all ccaches
  */
-struct krb5_cccol_cursor;
-typedef struct krb5_cccol_cursor *krb5_cccol_cursor;
+struct _krb5_cccol_cursor;
+typedef struct _krb5_cccol_cursor *krb5_cccol_cursor;
 
 /* for retrieve_cred */
 #define        KRB5_TC_MATCH_TIMES             0x00000001

diff --git a/src/lib/krb5/ccache/cccursor.c b/src/lib/krb5/ccache/cccursor.c
index 9a57d522306fef9581ef418bfca0def140b1b2f3..ab6f2a971e2afb24aa1048f180956e7b57dd9c18 100644 (file)
--- a/src/lib/krb5/ccache/cccursor.c
+++ b/src/lib/krb5/ccache/cccursor.c
@@ -43,7 +43,7 @@ struct cc_fullname {
     char *res;
 };
 
-struct krb5_cccol_cursor {
+struct _krb5_cccol_cursor {
     int pos;
     krb5_cc_typecursor typecursor;
     const krb5_cc_ops *ops;