Remove t_file.c as it is mostly redundant, does not build and cannot

be made to build because functions it depends on are now static.

Remove duplication between cc_file.c and fcc.h.

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

4 files changed, 7 insertions, 229 deletions

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 282ba0d..a03f9fd 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,10 @@
+2004-03-26  Sam Hartman  <hartmans@mit.edu>
+
+	* fcc.h: Remove all but the definition of krb5_cc_file_ops because
+	the rest is static in cc_file.c 
+
+	* Makefile.in (T_file):  Remove (no longer builds, no longer used)
+
 2004-03-25  Sam Hartman  <hartmans@mit.edu>
 
 	* cc_file.c (krb5_fcc_generate_new): Use mkstemp not mktemp when possible
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index d2d077d..5b4ef75 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -81,11 +81,6 @@ clean-windows::
 	@echo Making clean in krb5\ccache
 	$(RM) $(OBJFILE)
 
-T_FILE_OBJS=t_file.o
-
-t_file: $(T_FILE_OBJS) $(KRB5_BASE_DEPLIBS)
-	$(CC_LINK) -o t_file $(T_FILE_OBJS) $(KRB5_BASE_LIBS)
-
 T_CC_OBJS=t_cc.o
 
 t_cc: $(T_CC_OBJS) $(KRB5_BASE_DEPLIBS)
diff --git a/src/lib/krb5/ccache/fcc.h b/src/lib/krb5/ccache/fcc.h
index 4f8a815..f349da9 100644
--- a/src/lib/krb5/ccache/fcc.h
+++ b/src/lib/krb5/ccache/fcc.h
@@ -31,90 +31,6 @@
 #ifndef __KRB5_FILE_CCACHE__
 #define __KRB5_FILE_CCACHE__
 
-#define NEED_LOWLEVEL_IO
-#include "k5-int.h"
-#include <stdio.h>
-
 extern const krb5_cc_ops krb5_cc_file_ops;
 
-#define KRB5_OK 0
-
-#define KRB5_FCC_MAXLEN 100
-
-/*
- * FCC version 2 contains type information for principals.  FCC
- * version 1 does not.
- *  
- * FCC version 3 contains keyblock encryption type information, and is
- * architecture independent.  Previous versions are not.
- *
- * The code will accept version 1, 2, and 3 ccaches, and depending 
- * what KRB5_FCC_DEFAULT_FVNO is set to, it will create version 1, 2,
- * or 3 FCC caches.
- *
- * The default credentials cache should be type 3 for now (see
- * init_ctx.c).
- */
-
-#define KRB5_FCC_FVNO_1 0x0501		/* krb5 v5, fcc v1 */
-#define KRB5_FCC_FVNO_2 0x0502		/* krb5 v5, fcc v2 */
-#define KRB5_FCC_FVNO_3 0x0503		/* krb5 v5, fcc v3 */
-#define KRB5_FCC_FVNO_4 0x0504		/* krb5 v5, fcc v4 */
-
-#define	FCC_OPEN_AND_ERASE	1
-#define	FCC_OPEN_RDWR		2
-#define	FCC_OPEN_RDONLY		3
-
-/* Credential file header tags.
- * The header tags are constructed as:
- *	krb5_ui_2	tag
- *	krb5_ui_2	len
- *	krb5_octet	data[len]
- * This format allows for older versions of the fcc processing code to skip
- * past unrecognized tag formats.
- */
-#define FCC_TAG_DELTATIME	1
-
-#ifndef TKT_ROOT
-#ifdef MSDOS_FILESYSTEM
-#define TKT_ROOT "\\tkt"
-#else
-#define TKT_ROOT "/tmp/tkt"
-#endif
-#endif
-
-/* macros to make checking flags easier */
-#define OPENCLOSE(id) (((krb5_fcc_data *)id->data)->flags & KRB5_TC_OPENCLOSE)
-
-typedef struct _krb5_fcc_data {
-     char *filename;
-     int fd;
-     krb5_flags flags;
-     int mode;				/* needed for locking code */
-     int version;	      		/* version number of the file */
-} krb5_fcc_data;
-
-/* An off_t can be arbitrarily complex */
-typedef struct _krb5_fcc_cursor {
-     off_t pos;
-} krb5_fcc_cursor;
-
-#define MAYBE_OPEN(CONTEXT, ID, MODE) \
-{									\
-    if (OPENCLOSE (ID)) {						\
-	krb5_error_code maybe_open_ret = krb5_fcc_open_file (CONTEXT,ID,MODE);	\
-	if (maybe_open_ret) return maybe_open_ret; } }
-
-#define MAYBE_CLOSE(CONTEXT, ID, RET) \
-{									\
-    if (OPENCLOSE (ID)) {						\
-	krb5_error_code maybe_close_ret = krb5_fcc_close_file (CONTEXT,ID);	\
-	if (!(RET)) RET = maybe_close_ret; } }
-
-#define MAYBE_CLOSE_IGNORE(CONTEXT, ID) \
-{									\
-    if (OPENCLOSE (ID)) {						\
-	(void) krb5_fcc_close_file (CONTEXT,ID); } }
-
-/* DO NOT ADD ANYTHING AFTER THIS #endif */
 #endif /* __KRB5_FILE_CCACHE__ */
diff --git a/src/lib/krb5/ccache/t_file.c b/src/lib/krb5/ccache/t_file.c
deleted file mode 100644
index a41df47..0000000
--- a/src/lib/krb5/ccache/t_file.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * lib/krb5/ccache/file/fcc_test.c
- *
- * Copyright 1990 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- * 
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- * 
- *
- */
-
-
-#include "fcc.h"
-
-krb5_data client1 = {
-#define DATA "client1-comp1"
-     sizeof(DATA),
-     DATA,
-#undef DATA
-};
-
-krb5_data client2 = {
-#define DATA "client1-comp2"
-     sizeof(DATA),
-     DATA,
-#undef DATA
-};
-
-krb5_data server1 = {
-#define DATA "server1-comp1"
-     sizeof(DATA),
-     DATA,
-#undef DATA
-};
-
-krb5_data server2 = {
-#define DATA "server1-comp2"
-     sizeof(DATA),
-     DATA,
-#undef DATA
-};
-
-krb5_creds test_creds = {
-     NULL,
-     NULL,
-     {
-	  1,
-	  1,
-	  (unsigned char *) "1"
-     },
-     {
-	  1111,
-	  2222,
-	  3333,
-	  4444
-     },
-     1,
-     5555,
-     {
-#define TICKET "This is ticket 1"
-     sizeof(TICKET),
-     TICKET,
-#undef TICKET
-     },
-     {
-#define TICKET "This is ticket 2"
-     sizeof(TICKET),
-     TICKET,
-#undef TICKET
-     },
-};
-
-void init_test_cred()
-{
-     test_creds.client = (krb5_principal) malloc(sizeof(krb5_data *)*3);
-     test_creds.client[0] = &client1;
-     test_creds.client[1] = &client2;
-     test_creds.client[2] = NULL;
-
-     test_creds.server = (krb5_principal) malloc(sizeof(krb5_data *)*3);
-     test_creds.server[0] = &server1;
-     test_creds.server[1] = &server2;
-     test_creds.server[2] = NULL;
-}
-
-#define CHECK(kret,msg) \
-     if (kret != KRB5_OK) {\
-	  printf("%s returned %d\n", msg, kret);\
-     };
-						   
-void fcc_test()
-{
-     krb5_ccache id;
-     krb5_creds creds;
-     krb5_error_code kret;
-     krb5_cc_cursor cursor;
-
-     init_test_cred();
-
-     kret = krb5_fcc_resolve(context, &id, "/tmp/tkt_test");
-     CHECK(kret, "resolve");
-     kret = krb5_fcc_initialize(context, id, test_creds.client);
-     CHECK(kret, "initialize");
-     kret = krb5_fcc_store(context, id, &test_creds);
-     CHECK(kret, "store");
-
-     kret = krb5_fcc_start_seq_get(context, id, &cursor);
-     CHECK(kret, "start_seq_get");
-     kret = 0;
-     while (kret != KRB5_CC_END) {
-	  printf("Calling next_cred\n");
-	  kret = krb5_fcc_next_cred(context, id, &cursor, &creds);
-	  CHECK(kret, "next_cred");
-     }
-     kret = krb5_fcc_end_seq_get(context, id, &cursor);
-     CHECK(kret, "end_seq_get");
-
-     kret = krb5_fcc_destroy(context, id);
-     CHECK(kret, "destroy");
-     kret = krb5_fcc_close(context, id);
-     CHECK(kret, "close");
-}
-