Skip to content

Commit

Permalink
Add more verbosity when the -V option to kinit is specified. Based on
Browse files Browse the repository at this point in the history
a patch from Jeff Blaine <jblaine@kickflop.net>.

ticket: 6684

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23814 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information
greghudson committed Mar 17, 2010
1 parent efe92b4 commit 7ce25ce
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions src/clients/kinit/kinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -456,13 +456,21 @@ k5_begin(opts, k5)
opts->k5_cache_name);
return 0;
}
if (opts->verbose) {
fprintf(stderr, "Using specified cache: %s\n",
opts->k5_cache_name);
}
}
else
{
if ((code = krb5_cc_default(k5->ctx, &k5->cc))) {
com_err(progname, code, "while getting default ccache");
return 0;
}
if (opts->verbose) {
fprintf(stderr, "Using default cache: %s\n",
krb5_cc_get_name(k5->ctx, k5->cc));
}
}

if (opts->principal_name)
Expand Down Expand Up @@ -544,6 +552,9 @@ k5_begin(opts, k5)
com_err(progname, code, "when unparsing name");
return 0;
}
if (opts->verbose)
fprintf(stderr, "Using principal: %s\n", k5->name);

opts->principal_name = k5->name;

return 1;
Expand Down Expand Up @@ -644,6 +655,8 @@ k5_kinit(opts, k5)
opts->keytab_name);
goto cleanup;
}
if (opts->verbose)
fprintf(stderr, "Using keytab: %s\n", opts->keytab_name);
}

for (i = 0; i < opts->num_pa_opts; i++) {
Expand All @@ -655,6 +668,10 @@ k5_kinit(opts, k5)
opts->pa_opts[i].attr, opts->pa_opts[i].value);
goto cleanup;
}
if (opts->verbose) {
fprintf(stderr, "PA Option %s = %s\n", opts->pa_opts[i].attr,
opts->pa_opts[i].value);
}
}
code = krb5_get_init_creds_opt_set_out_ccache(k5->ctx, options, k5->cc);
if (code)
Expand Down Expand Up @@ -716,12 +733,16 @@ k5_kinit(opts, k5)
opts->k5_cache_name?opts->k5_cache_name:"");
goto cleanup;
}
if (opts->verbose)
fprintf(stderr, "Initialized cache\n");

code = krb5_cc_store_cred(k5->ctx, k5->cc, &my_creds);
if (code) {
com_err(progname, code, "while storing credentials");
goto cleanup;
}
if (opts->verbose)
fprintf(stderr, "Stored credentials\n");
}
notix = 0;

Expand Down

0 comments on commit 7ce25ce

Please sign in to comment.