Mercurial > dovecot > core-2.2

changeset 19723:18f836d56a64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doveadm auth test/login: Added -M <master user> parameter.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Mon, 08 Feb 2016 18:43:02 +0200
parents 69cf950c6e6f
children 8a5c932f5f33
files src/doveadm/doveadm-auth.c
diffstat 1 files changed, 16 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/doveadm-auth.c	Mon Feb 08 16:21:40 2016 +0200
+++ b/src/doveadm/doveadm-auth.c	Mon Feb 08 18:43:02 2016 +0200
@@ -27,6 +27,7 @@
 struct authtest_input {
 	pool_t pool;
 	const char *username;
+	const char *master_user;
 	const char *password;
 	struct auth_user_info info;
 	bool success;
@@ -155,8 +156,12 @@
 		i_fatal("Couldn't connect to auth socket");
 
 	init_resp = t_str_new(128);
+	str_append(init_resp, input->username);
 	str_append_c(init_resp, '\0');
-	str_append(init_resp, input->username);
+	if (input->master_user != NULL)
+		str_append(init_resp, input->master_user);
+	else
+		str_append(init_resp, input->username);
 	str_append_c(init_resp, '\0');
 	str_append(init_resp, input->password);
 
@@ -284,11 +289,14 @@
 	memset(&input, 0, sizeof(input));
 	input.info.service = "doveadm";
 
-	while ((c = getopt(argc, argv, "a:x:")) > 0) {
+	while ((c = getopt(argc, argv, "a:M:x:")) > 0) {
 		switch (c) {
 		case 'a':
 			auth_socket_path = optarg;
 			break;
+		case 'M':
+			input.master_user = optarg;
+			break;
 		case 'x':
 			auth_user_info_parse(&input.info, optarg);
 			break;
@@ -373,7 +381,7 @@
 					     "/auth-login", NULL);
 	auth_master_socket_path = t_strconcat(doveadm_settings->base_dir,
 					      "/auth-master", NULL);
-	while ((c = getopt(argc, argv, "a:m:x:")) > 0) {
+	while ((c = getopt(argc, argv, "a:m:M:x:")) > 0) {
 		switch (c) {
 		case 'a':
 			auth_login_socket_path = optarg;
@@ -381,6 +389,9 @@
 		case 'm':
 			auth_master_socket_path = optarg;
 			break;
+		case 'M':
+			input.master_user = optarg;
+			break;
 		case 'x':
 			auth_user_info_parse(&input.info, optarg);
 			break;
@@ -641,9 +652,9 @@
 
 struct doveadm_cmd doveadm_cmd_auth[] = {
 	{ cmd_auth_test, "auth test",
-	  "[-a <auth socket path>] [-x <auth info>] <user> [<password>]" },
+	  "[-a <auth socket path>] [-x <auth info>] [-M <master user>] <user> [<password>]" },
 	{ cmd_auth_login, "auth login",
-	  "[-a <auth-login socket path>] [-m <auth-master socket path>] [-x <auth info>] <user> [<password>]" },
+	  "[-a <auth-login socket path>] [-m <auth-master socket path>] [-x <auth info>] [-M <master user>] <user> [<password>]" },
 	{ cmd_auth_lookup, "auth lookup",
 	  "[-a <userdb socket path>] [-x <auth info>] [-f field] <user> [...]" },
 	{ cmd_auth_cache_flush, "auth cache flush",