From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 13 Apr 2004 21:37:33 +0000 (+0000)
Subject:   Since we must reserve the single letter prefixes on all platforms
X-Git-Tag: krb5-1.4-beta1~491
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b211f776c921d6100c26a1513b3627694ddfa30;p=krb5.git

  Since we must reserve the single letter prefixes on all platforms
  anyway, make the mapping apply on all platforms

ticket: 2531

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

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index d24e8e112..5ab9d75a3 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-13  Jeffrey Altman <jaltman@mit.edu>
+
+    * ccbase.c:
+      Since we have to reserve all the single letter
+      prefixes make them apply to all platforms
+
 2004-04-13  Jeffrey Altman <jaltman@mit.edu>
 
     * ccbase.c:
diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 35032a5d1..4fb5f8360 100644
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -119,7 +119,6 @@ krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache)
 
     pfxlen = cp - name;
 
-#if defined(_WIN32)
     if ( pfxlen == 1 && isalpha(name[0]) ) {
         /* We found a drive letter not a prefix - use FILE: */
         pfx = strdup("FILE:");
@@ -128,7 +127,6 @@ krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache)
 
         resid = name;
     } else {
-#endif
         resid = name + pfxlen + 1;
 
         pfx = malloc (pfxlen+1);
@@ -137,9 +135,7 @@ krb5_cc_resolve (krb5_context context, const char *name, krb5_ccache *cache)
 
         memcpy (pfx, name, pfxlen);
         pfx[pfxlen] = '\0';
-#if defined(_WIN32)
     }
-#endif
 
     *cache = (krb5_ccache) 0;
 
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index dd07ca64a..a261bf901 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-13  Jeffrey Altman <jaltman@mit.edu>
+
+    * ktbase.c:
+      Since we have to reserve all the single letter
+      prefixes make them apply to all platforms
+
 2004-04-13  Jeffrey Altman <jaltman@mit.edu>
 
     * ktbase.c:  On Windows, improve the treat drive letter
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index 6c5d02a3f..79c20ece9 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -113,7 +113,6 @@ krb5_kt_resolve (krb5_context context, const char *name, krb5_keytab *ktid)
 
     pfxlen = cp - name;
 
-#if defined(_WIN32)
     if ( pfxlen == 1 && isalpha(name[0]) ) {
         /* We found a drive letter not a prefix - use FILE: */
         pfx = strdup("FILE:");
@@ -122,7 +121,6 @@ krb5_kt_resolve (krb5_context context, const char *name, krb5_keytab *ktid)
 
         resid = name;
     } else {
-#endif
         resid = name + pfxlen + 1;
 	
         pfx = malloc (pfxlen+1);
@@ -131,9 +129,7 @@ krb5_kt_resolve (krb5_context context, const char *name, krb5_keytab *ktid)
 
         memcpy (pfx, name, pfxlen);
         pfx[pfxlen] = '\0';
-#if defined(_WIN32)
     }
-#endif
 
     *ktid = (krb5_keytab) 0;