pull up r19975 from trunk

 r19975@cathode-dark-space:  jaltman | 2007-09-24 23:25:28 -0400
 ticket: new
 subject: NIM: BUG: KRB5: cleanup krb5funcs
 component: windows

 (1) remove an extraneous backslash from the generated FILE:
     ccache name.  GetTempPath() always returns paths terminated
     with a backslash.

 (2) increase the max ccache name length to KRB5_CCH_CCNAME from
     MAX_PATH.

 These changes have dependencies on revisions 19891 and 19897.

ticket: 5772

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

diff --git a/src/windows/identity/plugins/krb5/krb5funcs.c b/src/windows/identity/plugins/krb5/krb5funcs.c
index 9c8db75098944b7ed9a054b48b5ef2938ed86abf..5a4120ff4ec8e605614053fec11ddafa4aa8db74 100644 (file)
--- a/src/windows/identity/plugins/krb5/krb5funcs.c
+++ b/src/windows/identity/plugins/krb5/krb5funcs.c
@@ -3125,7 +3125,8 @@ get_default_file_cache_for_identity(const wchar_t * idname,
     escape_string_for_filename(idname, escf, sizeof(escf));
     GetTempPath(ARRAYLENGTH(tmppath), tmppath);
 
-    StringCbPrintf(tccname, sizeof(tccname), L"FILE:%s\\krb5cc.%s", tmppath, escf);
+    /* The path returned by GetTempPath always ends in a backslash. */
+    StringCbPrintf(tccname, sizeof(tccname), L"FILE:%skrb5cc.%s", tmppath, escf);
     StringCbLength(tccname, sizeof(tccname), &cb);
     cb += sizeof(wchar_t);
 
@@ -3209,7 +3210,7 @@ khm_krb5_get_identity_default_ccache(khm_handle ident, wchar_t * buf, khm_size *
 
 khm_int32
 khm_krb5_get_identity_default_ccacheA(khm_handle ident, char * buf, khm_size * pcb) {
-    wchar_t wccname[MAX_PATH];
+    wchar_t wccname[KRB5_MAXCCH_CCNAME];
     khm_size cbcc;
     khm_int32 rv;