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

krb5: Fix warnings

Browse Source
This commit is contained in:
Nicolas Williams
2021-03-28 17:51:12 -05:00
parent 82a8744787
commit fb553dde1d
28 changed files with 166 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/krb5/krcache.c
View File

@@ -473,7 +473,7 @@ make_subsidiary_residual(krb5_context context,
char **presidual)
{
if (asprintf(presidual, "%s:%s:%s", anchor_name, collection_name,
subsidiary_name) < 0) {
subsidiary_name ? subsidiary_name : "tkt") < 0) {
*presidual = NULL;
return krb5_enomem(context);
}
@@ -498,6 +498,9 @@ get_collection(krb5_context context,
heim_base_atomic_init(pcollection_id, 0);
if (!anchor_name || !collection_name)
return KRB5_KCC_INVALID_ANCHOR;
if (strcmp(anchor_name, KRCC_PERSISTENT_ANCHOR) == 0) {
/*
* The collection name is a uid (or empty for the current effective
@@ -1262,7 +1265,7 @@ alloc_cache(krb5_context context,
subsidiary_name, &data->krc_name);
if (ret ||
(data->krc_collection = strdup(collection_name)) == NULL ||
(data->krc_subsidiary = strdup(subsidiary_name)) == NULL) {
(data->krc_subsidiary = strdup(subsidiary_name ? subsidiary_name : "tkt")) == NULL) {
if (data) {
free(data->krc_collection);
free(data->krc_name);
@@ -1887,7 +1890,8 @@ krcc_get_cache_next(krb5_context context,
continue;
/* Don't repeat the primary cache. */
if (strcmp(subsidiary_name, iter->primary_name) == 0)
if (iter->primary_name &&
strcmp(subsidiary_name ? subsidiary_name : "tkt", iter->primary_name) == 0)
continue;
/* We found a valid key */