move printing of keytab strings to better times

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9898 ec53bebd-3082-4978-b11e-865c3cabbd6b

diff --git a/admin/copy.c b/admin/copy.c
index 913eb893edf5637e814b4c9be61cb35942d79490..cd19d62dbb704e84ace05ce60e9e8fbd6832f428 100644 (file)
--- a/admin/copy.c
+++ b/admin/copy.c
@@ -67,15 +67,15 @@ kt_copy_int (const char *from, const char *to)
        return 1;
     }
 
-    if (verbose_flag)
-       fprintf(stderr, "copying %s to %s\n", from, to);
-
     ret = krb5_kt_start_seq_get (context, src_keytab, &cursor);
     if (ret) {
        krb5_warn (context, ret, "krb5_kt_start_seq_get %s", keytab_string);
        goto out;
     }
 
+    if (verbose_flag)
+       fprintf(stderr, "copying %s to %s\n", from, to);
+
     while((ret = krb5_kt_next_entry(context, src_keytab,
                                    &entry, &cursor)) == 0) {
        char *name_str;

diff --git a/admin/list.c b/admin/list.c
index de09542705a26dfa76c1d2945563a3c4616b40ff..8af146a27f3558f2e71d364aa00c058a488056e1 100644 (file)
--- a/admin/list.c
+++ b/admin/list.c
@@ -77,13 +77,14 @@ do_list(const char *keytab_string)
        return 0;
     }
 
-    printf ("%s:\n\n", keytab_string);
-       
     ret = krb5_kt_start_seq_get(context, keytab, &cursor);
     if(ret){
        krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
        goto out;
     }
+
+    printf ("%s:\n\n", keytab_string);
+       
     while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0){
 #define CHECK_MAX(F) if(max_##F < strlen(kp->F)) max_##F = strlen(kp->F)
 

diff --git a/admin/purge.c b/admin/purge.c
index 6b3faf4b23ff3151a402831c77bc1fe87c4baeb7..e6a49e37a1e3c37975d3c286f17ec4bc994b6032 100644 (file)
--- a/admin/purge.c
+++ b/admin/purge.c
@@ -147,15 +147,15 @@ kt_purge(int argc, char **argv)
        return 1;
     }
 
-    if (verbose_flag)
-       fprintf (stderr, "Using keytab %s\n", keytab_string);
-       
     ret = krb5_kt_start_seq_get(context, keytab, &cursor);
     if(ret){
        krb5_warn(context, ret, "krb5_kt_start_seq_get %s", keytab_string);
        goto out;
     }
 
+    if (verbose_flag)
+       fprintf (stderr, "Using keytab %s\n", keytab_string);
+       
     while((ret = krb5_kt_next_entry(context, keytab, &entry, &cursor)) == 0) {
        add_entry (entry.principal, entry.vno, &head);
        krb5_kt_free_entry(context, &entry);