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

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

diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 2b15ff6f32bdbdf99470a76e7a34eb8281fbe497..9c0b4cfe6bb97bce416c89f29cfc48fba682091b 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(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 e633c0c3a76debb7830602c57ddd9d07b47b81c6..2f8d1dd6fbbd399f048920d0da566713b523b3fb 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(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;