doveadm: Detect '?' also as wildcard character in usernames.

--HG--
branch : HEAD

diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index da74c6da5397900e70d05ce7ca5bca83a070d128..dbe399ef90233915ef0f5da8c111a58a830bc366 100644 (file)
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -229,7 +229,8 @@ auth_cmd_common(const struct doveadm_cmd *cmd, int argc, char *argv[])
 
        have_wildcards = FALSE;
        for (i = optind; argv[i] != NULL; i++) {
-               if (strchr(argv[i], '*') != NULL) {
+               if (strchr(argv[i], '*') != NULL ||
+                   strchr(argv[i], '?') != NULL) {
                        have_wildcards = TRUE;
                        break;
                }

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index c1ddb625ab264de983ac053516c5be844abf197a..575053ada0c40268afa6bb564ff8f2ce2caf0604 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -359,7 +359,8 @@ doveadm_mail_cmd(const struct doveadm_mail_cmd *cmd, int argc, char *argv[])
                        service_flags |=
                                MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP;
                        username = optarg;
-                       if (strchr(username, '*') != NULL)
+                       if (strchr(username, '*') != NULL ||
+                           strchr(username, '?') != NULL)
                                wildcard_user = username;
                        break;
                default: