dovecot-2.0-sslstream: imap: Removed all dump-capability handlin...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/1c166f7d673e
changeset: 10118:1c166f7d673e
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Oct 20 19:43:22 2009 -0400
description:
imap: Removed all dump-capability handling. We don't use it anymore.

diffstat:

1 file changed, 3 insertions(+), 17 deletions(-)
src/imap/main.c |   20 +++-----------------

diffs (59 lines):

diff -r 50db5e7bddd9 -r 1c166f7d673e src/imap/main.c
--- a/src/imap/main.c	Tue Oct 20 19:41:50 2009 -0400
+++ b/src/imap/main.c	Tue Oct 20 19:43:22 2009 -0400
@@ -102,8 +102,7 @@ main_stdio_init_user(const struct imap_s
 	client_add_input(client, input_buf);
 }
 
-static void
-main_stdio_run(bool dump_capability)
+static void main_stdio_run(void)
 {
 	struct mail_storage_service_input input;
 	struct mail_user *mail_user;
@@ -131,12 +130,6 @@ main_stdio_run(bool dump_capability)
 	if (set->shutdown_clients)
 		master_service_set_die_with_master(master_service, TRUE);
 
-	if (dump_capability) {
-		struct client *client = client_create(0, 1, mail_user, set);
-		printf("%s\n", str_c(client->capability_string));
-		exit(0);
-	}
-
 	/* fake that we're running, so we know if client was destroyed
 	   while handling its initial input */
 	io_loop_set_running(current_ioloop);
@@ -208,7 +201,6 @@ int main(int argc, char *argv[], char *e
 int main(int argc, char *argv[], char *envp[])
 {
 	enum master_service_flags service_flags = 0;
-	bool dump_capability;
 	int c;
 
 	if (IS_STANDALONE() && getuid() == 0 &&
@@ -226,12 +218,6 @@ int main(int argc, char *argv[], char *e
 			MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT;
 	}
 
-	dump_capability = getenv("DUMP_CAPABILITY") != NULL;
-	if (dump_capability) {
-		storage_service_flags |=
-			MAIL_STORAGE_SERVICE_FLAG_NO_RESTRICT_ACCESS;
-	}
-
 	master_service = master_service_init("imap", service_flags, argc, argv);
 	while ((c = getopt(argc, argv, master_service_getopt_string())) > 0) {
 		if (!master_service_parse_option(master_service, c, optarg))
@@ -244,9 +230,9 @@ int main(int argc, char *argv[], char *e
 	commands_init();
 	imap_fetch_handlers_init();
 
-	if (IS_STANDALONE() || dump_capability) {
+	if (IS_STANDALONE()) {
 		T_BEGIN {
-			main_stdio_run(dump_capability);
+			main_stdio_run();
 		} T_END;
 	} else {
 		master_login = master_login_init("auth-master",