summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeffrey Altman <jaltman@secure-endpoints.com>2007-09-25 03:25:28 +0000
committerJeffrey Altman <jaltman@secure-endpoints.com>2007-09-25 03:25:28 +0000
commitffcdd324f1c2793619ad1cda5f4ac2db43883b72 (patch)
treeb03b6afc743ff47d45613df9c2496f6addc43bf1 /src
parentdfead171781062695dc190a235453d844d0f331b (diff)
downloadkrb5-ffcdd324f1c2793619ad1cda5f4ac2db43883b72.tar.gz
krb5-ffcdd324f1c2793619ad1cda5f4ac2db43883b72.tar.xz
krb5-ffcdd324f1c2793619ad1cda5f4ac2db43883b72.zip
NIM: BUG: KRB5: cleanup krb5funcs
(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: new component: windows git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19975 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/windows/identity/plugins/krb5/krb5funcs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/windows/identity/plugins/krb5/krb5funcs.c b/src/windows/identity/plugins/krb5/krb5funcs.c
index 9c8db7509..5a4120ff4 100644
--- 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;