Mercurial > dovecot > core-2.2

changeset 12627:e945bf4f1e59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imapc: Default imapc_user to %u.
author Timo Sirainen <tss@iki.fi>
date Tue, 01 Feb 2011 19:19:01 +0200
parents aa131065b53d
children 49f487b435bd
files src/lib-storage/index/imapc/imapc-settings.c src/lib-storage/index/imapc/imapc-storage.c
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/imapc/imapc-settings.c	Tue Feb 01 19:17:36 2011 +0200
+++ b/src/lib-storage/index/imapc/imapc-settings.c	Tue Feb 01 19:19:01 2011 +0200
@@ -17,7 +17,7 @@
 	DEF(SET_STR, imapc_host),
 	DEF(SET_UINT, imapc_port),
 
-	DEF(SET_STR, imapc_user),
+	DEF(SET_STR_VARS, imapc_user),
 	DEF(SET_STR, imapc_password),
 
 	DEF(SET_ENUM, imapc_ssl),
@@ -30,7 +30,7 @@
 	.imapc_host = "",
 	.imapc_port = 143,
 
-	.imapc_user = "",
+	.imapc_user = "%u",
 	.imapc_password = "",
 
 	.imapc_ssl = "no:imaps:starttls",
--- a/src/lib-storage/index/imapc/imapc-storage.c	Tue Feb 01 19:17:36 2011 +0200
+++ b/src/lib-storage/index/imapc/imapc-storage.c	Tue Feb 01 19:19:01 2011 +0200
@@ -176,8 +176,6 @@
 	}
 	set.port = storage->set->imapc_port;
 	set.username = storage->set->imapc_user;
-	if (*set.username == '\0')
-		set.username = _storage->user->username;
 	set.password = storage->set->imapc_password;
 	if (*set.password == '\0') {
 		*error_r = "missing imapc_password";