From 393305f9d9b822df42c9743025072004e483fa1a Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 25 Sep 2006 23:09:50 +0000 Subject: [PATCH] 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 --- src/lib/krb5/ccache/ccbase.c | 4 ++-- src/lib/krb5/keytab/ktbase.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c index 2b15ff6f3..9c0b4cfe6 100644 --- 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 e633c0c3a..2f8d1dd6f 100644 --- 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; -- 2.26.2