pull up r18561 from trunk

 r18561@cathode-dark-space:  jaltman | 2006-09-05 14:47:29 -0400
 ticket: new
 subject: windows ccache and keytab file paths without a prefix

 	ktbase.c, ccbase.c:  When a file path is specified without
         	the prefix we must infer the use of the "FILE" prefix.
  		However, we were setting the prefix including the colon
    		separator when the separator should have been ignored.

ticket: 4237
version_fixed: 1.5.2

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

diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index df63e259d4cf3278b43a3c366fe04e3acb2c6186..3a68ecac4f7681d955011dd582b15d0d177c4b19 100644 (file)
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -152,8 +152,8 @@ krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache)
     pfxlen = cp - name;
 
     if ( pfxlen == 1 && isalpha((unsigned char) name[0]) ) {
-        /* We found a drive letter not a prefix - use FILE: */
-        pfx = strdup("FILE:");
+        /* We found a drive letter not a prefix - use FILE */
+        pfx = strdup("FILE");
         if (!pfx)
             return ENOMEM;
 

diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index 8374e65468b6bd275d0cdec6b10690a69dd3bff9..79c9151efdc897f9616ffe2b1ffe5a9766da8b21 100644 (file)
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -132,8 +132,8 @@ krb5_kt_resolve (krb5_context context, const char *name, krb5_keytab *ktid)
     pfxlen = cp - name;
 
     if ( pfxlen == 1 && isalpha((unsigned char) name[0]) ) {
-        /* We found a drive letter not a prefix - use FILE: */
-        pfx = strdup("FILE:");
+        /* We found a drive letter not a prefix - use FILE */
+        pfx = strdup("FILE");
         if (!pfx)
             return ENOMEM;