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

Use defrealm in last-resort parse of kt principal

Browse Source
This commit is contained in:
Viktor Dukhovni
2013-10-11 16:05:45 +00:00
committed by Viktor Dukhovni
parent eea23fe6ed
commit b09e1a137b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kuser/kinit.c
View File

@@ -1073,7 +1073,6 @@ get_princ_kt(krb5_context context,
krb5_ccache ccache; krb5_ccache ccache;
krb5_kt_cursor cursor; krb5_kt_cursor cursor;
krb5_keytab_entry entry; krb5_keytab_entry entry;
int parseflags = 0;
char *def_realm; char *def_realm;
if (name == NULL) { if (name == NULL) {
@@ -1091,7 +1090,8 @@ get_princ_kt(krb5_context context,
if (name) { if (name) {
/* If the principal specifies an explicit realm, just use that. */ /* If the principal specifies an explicit realm, just use that. */
parseflags |= KRB5_PRINCIPAL_PARSE_NO_DEF_REALM; int parseflags = KRB5_PRINCIPAL_PARSE_NO_DEF_REALM;
parse_name_realm(context, name, parseflags, NULL, &tmp); parse_name_realm(context, name, parseflags, NULL, &tmp);
if (krb5_principal_get_realm(context, tmp) != NULL) { if (krb5_principal_get_realm(context, tmp) != NULL) {
*principal = tmp; *principal = tmp;
@@ -1131,7 +1131,7 @@ get_princ_kt(krb5_context context,
if (ret != 0 || (ret = krb5_kt_end_seq_get(context, kt, &cursor)) != 0) if (ret != 0 || (ret = krb5_kt_end_seq_get(context, kt, &cursor)) != 0)
krb5_err(context, 1, ret, "get_princ_kt"); krb5_err(context, 1, ret, "get_princ_kt");
if (!*principal) if (!*principal)
parse_name_realm(context, name, parseflags, NULL, principal); parse_name_realm(context, name, 0, NULL, principal);
krb5_free_principal(context, tmp); krb5_free_principal(context, tmp);
free(def_realm); free(def_realm);