Always register the file ccache in the set of registered ops. The

resolve code may also find it as the default ops on some platforms,
but this will not cause problems.

ticket: 1684
owner: lxs
status: open

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

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 7e586613cec63a90f20b69017776a7f72b5a2266..3b7edf26dfd692eed895f7a90e94bf86d1efdf84 100644 (file)
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-22  Sam Hartman  <hartmans@mit.edu>
+
+       * ccbase.c: Always register the file credentials cache type.  If
+       we do not, then when USE_CCAPI is defined, it will not be
+       available. 
+
 2003-07-17  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (LIBNAME) [##WIN16##]: Don't define.

diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index ddd5e80d4bc3d2f4f9fc4be5bda55dc58690e0a3..cfe96ec05743313b3924c6cbce08818a7812405c 100644 (file)
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -29,6 +29,8 @@
 
 #include "k5-int.h"
 
+#include "fcc.h"
+
 struct krb5_cc_typelist
  {
   krb5_cc_ops *ops;
@@ -36,9 +38,13 @@ struct krb5_cc_typelist
  };
 extern const krb5_cc_ops krb5_mcc_ops;
 
-static struct krb5_cc_typelist cc_entry = { &krb5_mcc_ops, NULL };
+static struct krb5_cc_typelist cc_mcc_entry = { &krb5_mcc_ops, NULL };
+
+static struct krb5_cc_typelist cc_fcc_entry = { &krb5_cc_file_ops,
+                                               &cc_mcc_entry };
+
 
-static struct krb5_cc_typelist *cc_typehead = &cc_entry;
+static struct krb5_cc_typelist *cc_typehead = &cc_fcc_entry;
 
 /*
  * Register a new credentials cache type