From: Timo Sirainen <tss@iki.fi>
Date: Fri, 28 May 2010 15:44:14 +0000 (+0100)
Subject: doveadm: Detect '?' also as wildcard character in usernames.
X-Git-Tag: 2.0.beta6~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd6c57fab41ae6730473cd5b261c134f2f6ae00c;p=thirdparty%2Fdovecot%2Fcore.git

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 da74c6da53..dbe399ef90 100644
--- 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 c1ddb625ab..575053ada0 100644
--- 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: