From: Timo Sirainen <tss@iki.fi>
Date: Mon, 18 Nov 2013 14:26:31 +0000 (+0200)
Subject: doveadm user: Fixed now printing with a non-default formatter
X-Git-Tag: 2.2.8~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a92681ceea33ef803ec1d1a1f6567faab928ff01;p=thirdparty%2Fdovecot%2Fcore.git

doveadm user: Fixed now printing with a non-default formatter
---

diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index 503fb01713..9ebc0ad37a 100644
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -388,12 +388,6 @@ static int cmd_user_mail_input(struct mail_storage_service_ctx *storage_service,
 		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 @@ static void cmd_user(int argc, char *argv[])
 			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) {