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

kinit: Make --default-for behavior optional

Browse Source 
Scripts that run kinit -k will break otherwise.
This commit is contained in:
Nicolas Williams
2021-03-31 21:10:48 -05:00
parent b0e5c471f6
commit afa1624682
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kuser/kinit.1
View File

@@ -129,7 +129,7 @@ then the default cache may be either
or or
.Ar FILE:/tmp/krb5cc_%{uid} .Ar FILE:/tmp/krb5cc_%{uid}
if the principal is the default principal for the user, meaning if the principal is the default principal for the user, meaning
that it is of rht form that it is of the form
.Ar ${USER}@${user_realm} .Ar ${USER}@${user_realm}
or or
.Ar ${USER}@${default_realm} . .Ar ${USER}@${default_realm} .

5
kuser/kinit.c
View File

@@ -192,8 +192,8 @@ static struct getargs args[] = {
{ "change-default", 0, arg_negative_flag, &switch_cache_flags, { "change-default", 0, arg_negative_flag, &switch_cache_flags,
NP_("switch the default cache to the new credentials cache", ""), NULL }, NP_("switch the default cache to the new credentials cache", ""), NULL },
{ "default-for-principal", 0, arg_negative_flag, &default_for, { "default-for-principal", 0, arg_flag, &default_for,
NP_("use a default cache appropriate for the client principal name", ""), NULL }, NP_("Use a default cache appropriate for the client principal", ""), NULL },
{ "ok-as-delegate", 0, arg_flag, &ok_as_delegate_flag, { "ok-as-delegate", 0, arg_flag, &ok_as_delegate_flag,
NP_("honor ok-as-delegate on tickets", ""), NULL }, NP_("honor ok-as-delegate on tickets", ""), NULL },
@@ -1551,6 +1551,7 @@ main(int argc, char **argv)
krb5_cc_get_name(context, ccache)); krb5_cc_get_name(context, ccache));
setenv("KRB5CCNAME", s, 1); setenv("KRB5CCNAME", s, 1);
unique_ccache = TRUE; unique_ccache = TRUE;
switch_cache_flags = 0;
} else if (default_for) { } else if (default_for) {
ret = krb5_cc_default_for(context, principal, &ccache); ret = krb5_cc_default_for(context, principal, &ccache);
if (switch_cache_flags == -1) if (switch_cache_flags == -1)