dovecot-2.2: doveadm user: Fixed now printing with a non-default...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/d925674c4329
changeset: 16983:d925674c4329
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Nov 18 16:26:31 2013 +0200
description:
doveadm user: Fixed now printing with a non-default formatter

diffstat:

 src/doveadm/doveadm-auth.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (28 lines):

diff -r 2503785cf989 -r d925674c4329 src/doveadm/doveadm-auth.c
--- a/src/doveadm/doveadm-auth.c	Mon Nov 18 16:23:42 2013 +0200
+++ b/src/doveadm/doveadm-auth.c	Mon Nov 18 16:26:31 2013 +0200
@@ -388,12 +388,6 @@
 		return 0;
 	}
 
-	if (show_field == NULL && !doveadm_print_is_initialized()) {
-		doveadm_print_init(DOVEADM_PRINT_TYPE_TAB);
-		doveadm_print_header_simple("field");
-		doveadm_print_header_simple("value");
-	}
-
 	cmd_user_mail_input_field("uid", user->set->mail_uid, show_field);
 	cmd_user_mail_input_field("gid", user->set->mail_gid, show_field);
 	cmd_user_mail_input_field("home", user->set->mail_home, show_field);
@@ -487,6 +481,11 @@
 			MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP);
 		mail_storage_service_set_auth_conn(storage_service, conn);
 		conn = NULL;
+		if (show_field == NULL) {
+			doveadm_print_init(DOVEADM_PRINT_TYPE_TAB);
+			doveadm_print_header_simple("field");
+			doveadm_print_header_simple("value");
+		}
 	}
 
 	while ((input.username = argv[optind++]) != NULL) {