From: Marco Bettini <marco.bettini@open-xchange.com>
Date: Thu, 2 Feb 2023 11:00:04 +0000 (+0000)
Subject: doveadm auth login: Separate userdb's user from userdb actual extra fields in command... 
X-Git-Tag: 2.4.0~3000
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9652d079118d7b1b20f2125bb69142b3dbd67f76;p=thirdparty%2Fdovecot%2Fcore.git

doveadm auth login: Separate userdb's user from userdb actual extra fields in command output
---

diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index 74edb73f78..d055da38de 100644
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -441,16 +441,20 @@ login_server_auth_callback(const char *const *auth_args,
 			   const char *errormsg, void *context)
 {
 	struct authtest_input *input = context;
-	unsigned int i;
 
 	io_loop_stop(current_ioloop);
 	if (errormsg != NULL) {
 		e_error(input->event, "userdb lookup failed: %s", errormsg);
 		return;
 	}
-	printf("userdb extra fields:\n");
-	for (i = 0; auth_args[i] != NULL; i++)
-		printf("  %s\n", auth_args[i]);
+
+	if (*auth_args != NULL) {
+		printf("userdb user: %s\n", *auth_args++);
+		printf("userdb extra fields:\n");
+		while (*auth_args != NULL)
+			printf("  %s\n", *auth_args++);
+	}
+
 	input->success = TRUE;
 }