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 e53622e4891cdfc8e58a2305e32877efcae75027..07792f6930cdfa9c47d047f09d859a45c38e44d6 100644 (file)
--- 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 011d44f0a61d4be301f3602f94cb94e9699f74b2..aba9df99da575c965098b56d8be95538ca7b91f7 100644 (file)
--- 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);