From: Timo Sirainen <tss@iki.fi>
Date: Thu, 13 May 2010 11:01:14 +0000 (+0200)
Subject: doveadm: Don't crash when giving only first word of multi-word command.
X-Git-Tag: 2.0.beta6~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78ab753927acf4466f38e4a50694be3f4c4cc9ab;p=thirdparty%2Fdovecot%2Fcore.git

doveadm: Don't crash when giving only first word of multi-word command.

--HG--
branch : HEAD
---

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index e53622e489..07792f6930 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -344,7 +344,7 @@ doveadm_mail_try_run_multi_word(const struct doveadm_mail_cmd *cmd,
 {
 	unsigned int len;
 
-	if (argc < 1)
+	if (argc < 2)
 		return FALSE;
 
 	len = strlen(argv[1]);
diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index 011d44f0a6..aba9df99da 100644
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -91,7 +91,7 @@ doveadm_try_run_multi_word(const struct doveadm_cmd *cmd,
 {
 	unsigned int len;
 
-	if (argc < 1)
+	if (argc < 2)
 		return FALSE;
 
 	len = strlen(argv[1]);
@@ -150,7 +150,7 @@ static void doveadm_load_modules(void)
 	mod_set.version = master_service_get_version_string(master_service);
 	mod_set.require_init_funcs = TRUE;
 	mod_set.debug = doveadm_debug;
-	mod_set.ignore_dlopen_errors = TRUE;
+	mod_set.ignore_dlopen_errors = !doveadm_debug;
 
 	modules = module_dir_load_missing(modules, DOVEADM_MODULEDIR,
 					  NULL, &mod_set);