Mercurial > dovecot > core-2.2

changeset 3611:5d92a45fc751 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When passwd-file has %d, drop domain names from username lookups only if %d was given without any modifiers.
author Timo Sirainen <tss@iki.fi>
date Sat, 24 Sep 2005 16:41:27 +0300
parents 24d9c17b4cb6
children c64473977187
files src/auth/db-passwd-file.c
diffstat 1 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/db-passwd-file.c	Sat Sep 24 15:56:33 2005 +0300
+++ b/src/auth/db-passwd-file.c	Sat Sep 24 16:41:27 2005 +0300
@@ -247,18 +247,16 @@
 	for (p = path; *p != '\0'; p++) {
 		if (*p == '%' && p[1] != '\0') {
 			p++;
-			switch (var_get_key(p)) {
-			case 'd':
+			if (*p == 'd') {
+				/* drop domains out only if %d is given
+				   without modifiers */
 				db->domain_var = TRUE;
+			}
+
+			if (var_get_key(p) == '%')
+				percents = TRUE;
+			else
 				db->vars = TRUE;
-				break;
-			case '%':
-				percents = TRUE;
-				break;
-			default:
-				db->vars = TRUE;
-				break;
-			}
 		}
 	}