diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c index 125491604..736fd5a2c 100644 --- a/lib/krb5/config_file.c +++ b/lib/krb5/config_file.c @@ -560,10 +560,10 @@ krb5_config_vget_strings(krb5_context context, goto cleanup; s = strtok_r(tmp, " \t", &pos); while(s){ - char **tmp = realloc(strings, (nstr + 1) * sizeof(*strings)); - if(tmp == NULL) + char **tmp2 = realloc(strings, (nstr + 1) * sizeof(*strings)); + if(tmp2 == NULL) goto cleanup; - strings = tmp; + strings = tmp2; strings[nstr] = strdup(s); nstr++; if(strings[nstr-1] == NULL) diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c index b52ab68fa..2d68cd859 100644 --- a/lib/krb5/fcache.c +++ b/lib/krb5/fcache.c @@ -492,11 +492,11 @@ init_fcc (krb5_context context, goto out; } while(length > 0) { - int16_t tag, data_len; + int16_t dtag, data_len; int i; int8_t dummy; - ret = krb5_ret_int16 (sp, &tag); + ret = krb5_ret_int16 (sp, &dtag); if(ret) { krb5_clear_error_string(context); ret = KRB5_CC_FORMAT; @@ -508,7 +508,7 @@ init_fcc (krb5_context context, ret = KRB5_CC_FORMAT; goto out; } - switch (tag) { + switch (dtag) { case FCC_TAG_DELTATIME : ret = krb5_ret_int32 (sp, &context->kdc_sec_offset); if(ret) {