oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

List FILE collection even when KRB5CCNAME is a sub

Browse Source 
Setting KRB5CCNAME=/tmp/krb5cc_${UID}+${princ} should not prevent
listing the FILE collection.
This commit is contained in:
Nicolas Williams
2020-03-18 00:43:01 -05:00
parent cc6a3f337b
commit 31a73c3c27
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/krb5/fcache.c
View File

@@ -1284,6 +1284,8 @@ is_default_collection(krb5_context context, const char *name,
{ {
krb5_error_code ret; krb5_error_code ret;
const char *def_loc[2] = { KRB5_DEFAULT_CCNAME_FILE, NULL }; const char *def_loc[2] = { KRB5_DEFAULT_CCNAME_FILE, NULL };
const char *sep;
size_t namelen;
size_t i; size_t i;
*res = 0; *res = 0;
@@ -1291,6 +1293,10 @@ is_default_collection(krb5_context context, const char *name,
*res = 1; *res = 1;
return 0; return 0;
} }
if ((sep = strchr(name, FILESUBSEPCHR)))
namelen = (size_t)(sep - name);
else
namelen = strlen(name);
if (def_locs == NULL) if (def_locs == NULL)
def_locs = def_loc; def_locs = def_loc;
for (i = 0; !(*res) && def_locs[i]; i++) { for (i = 0; !(*res) && def_locs[i]; i++) {
@@ -1298,7 +1304,8 @@ is_default_collection(krb5_context context, const char *name,
if ((ret = _krb5_expand_default_cc_name(context, def_locs[i], &e))) if ((ret = _krb5_expand_default_cc_name(context, def_locs[i], &e)))
return ret; return ret;
*res = strcmp(name, e) == 0; *res = strncmp(e, name, namelen) == 0 &&
(sep == NULL || e[namelen] == FILESUBSEPCHR || e[namelen] == '\0');
free(e); free(e);
} }
return 0; return 0;