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

Call krb5_set_error_message() and don't clobber ret in debug code

Browse Source
This commit is contained in:
Nicolas Williams
2011-10-20 12:56:12 -05:00
parent 248e1eb772
commit f4471b11d6
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/krb5/get_cred.c
View File

@@ -1484,7 +1484,6 @@ out:
krb5_free_principal(context, in_creds.client);
krb5_free_name_canon_iterator(context, name_canon_iter);
_krb5_debug(context, 5, "krb5_get_creds: ret = %d", ret);
return ret;
}

4
lib/krb5/keytab.c
View File

@@ -677,6 +677,10 @@ krb5_kt_get_entry(krb5_context context,
enctype, entry);
} while (ret == KRB5_KT_NOTFOUND && name_canon_iter);
if (ret != KRB5_KT_NOTFOUND)
krb5_set_error_message(context, ret,
N_("Name canon failed while searching keytab",
""));
krb5_free_name_canon_iterator(context, name_canon_iter);
return ret;
}

13
lib/krb5/principal.c
View File

@@ -1630,10 +1630,10 @@ get_host_realm(krb5_context context, const char *hostname, char **realm)
if ((ret = krb5_get_host_realm(context, hostname, &hrealms)))
return ret;
if (!hrealms)
return KRB5_ERR_HOST_REALM_UNKNOWN;
return KRB5_ERR_HOST_REALM_UNKNOWN; /* krb5_set_error() already done */
if (!hrealms[0]) {
krb5_free_host_realm(context, hrealms);
return KRB5_ERR_HOST_REALM_UNKNOWN;
return KRB5_ERR_HOST_REALM_UNKNOWN; /* krb5_set_error() already done */
}
*realm = strdup(hrealms[0]);
krb5_free_host_realm(context, hrealms);
@@ -1774,9 +1774,11 @@ _krb5_apply_name_canon_rule(krb5_context context, krb5_name_canon_rule rule,
}
out:
if (!ret && out_princ) {
if (!ret && *out_princ) {
krb5_error_code ret2;
char *unparsed;
ret = krb5_unparse_name(context, *out_princ, &unparsed);
ret2 = krb5_unparse_name(context, *out_princ, &unparsed);
if (ret) {
_krb5_debug(context, 5, "Couldn't unparse resulting princ! (%d)",
ret);
@@ -1794,6 +1796,9 @@ out:
free(realm);
if (*out_princ)
(*out_princ)->name.name_type = KRB5_NT_SRV_HST;
if (ret)
krb5_set_error_message(context, ret,
N_("Name canon rule application failed", ""));
return ret;
}