dovecot-2.2: doveadm: Renamed "auth" command to "auth test".

dovecot at dovecot.org dovecot at dovecot.org
Fri Aug 10 05:29:48 EEST 2012


details:   http://hg.dovecot.org/dovecot-2.2/rev/19b6a8c025e4
changeset: 14841:19b6a8c025e4
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Aug 10 05:27:45 2012 +0300
description:
doveadm: Renamed "auth" command to "auth test".

diffstat:

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

diffs (48 lines):

diff -r 6a0954d0ce09 -r 19b6a8c025e4 src/doveadm/doveadm-auth.c
--- a/src/doveadm/doveadm-auth.c	Fri Aug 10 05:24:07 2012 +0300
+++ b/src/doveadm/doveadm-auth.c	Fri Aug 10 05:27:45 2012 +0300
@@ -249,19 +249,12 @@
 	auth_master_deinit(&conn);
 }
 
-static void cmd_auth(int argc, char *argv[])
+static void cmd_auth_test(int argc, char *argv[])
 {
 	const char *auth_socket_path = NULL;
 	struct authtest_input input;
 	int c;
 
-	if (null_strcmp(argv[1], "cache") == 0 &&
-	    null_strcmp(argv[2], "flush") == 0) {
-		/* kludgy: handle "doveadm auth cache" command instead */
-		cmd_auth_cache_flush(argc-2, argv+2);
-		return;
-	}
-
 	memset(&input, 0, sizeof(input));
 	input.info.service = "doveadm";
 
@@ -274,12 +267,12 @@
 			auth_user_info_parse(&input.info, optarg);
 			break;
 		default:
-			auth_cmd_help(cmd_auth);
+			auth_cmd_help(cmd_auth_test);
 		}
 	}
 
 	if (optind == argc)
-		auth_cmd_help(cmd_auth);
+		auth_cmd_help(cmd_auth_test);
 
 	input.username = argv[optind++];
 	input.password = argv[optind] != NULL ? argv[optind++] :
@@ -423,7 +416,7 @@
 }
 
 struct doveadm_cmd doveadm_cmd_auth[] = {
-	{ cmd_auth, "auth",
+	{ cmd_auth_test, "auth test",
 	  "[-a <auth socket path>] [-x <auth info>] <user> [<password>]" },
 	{ cmd_auth_cache_flush, "auth cache flush",
 	  "[-a <master socket path>] [<user> [...]]" },


More information about the dovecot-cvs mailing list