svn rev #23814: trunk/src/clients/kinit/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23814
Commit By: ghudson
Log Message:
ticket: 6684

Add more verbosity when the -V option to kinit is specified.  Based on
a patch from Jeff Blaine <jblaine at kickflop.net>.



Changed Files:
U   trunk/src/clients/kinit/kinit.c
Modified: trunk/src/clients/kinit/kinit.c
===================================================================
--- trunk/src/clients/kinit/kinit.c	2010-03-17 19:34:48 UTC (rev 23813)
+++ trunk/src/clients/kinit/kinit.c	2010-03-17 20:16:32 UTC (rev 23814)
@@ -456,6 +456,10 @@
                     opts->k5_cache_name);
             return 0;
         }
+        if (opts->verbose) {
+            fprintf(stderr, "Using specified cache: %s\n",
+                    opts->k5_cache_name);
+        }
     }
     else
     {
@@ -463,6 +467,10 @@
             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)
@@ -544,6 +552,9 @@
         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;
@@ -644,6 +655,8 @@
                     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++) {
@@ -655,6 +668,10 @@
                     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)
@@ -716,12 +733,16 @@
                     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;