From: Timo Sirainen <tss@iki.fi>
Date: Sun, 5 Oct 2008 13:59:58 +0000 (+0300)
Subject: expire-tool: --test now shows the username in info messages.
X-Git-Tag: 1.2.alpha2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dac7ff48b2995fffa3f4111e73df3d79ef78bbd;p=thirdparty%2Fdovecot%2Fcore.git

expire-tool: --test now shows the username in info messages.

--HG--
branch : HEAD
---

diff --git a/src/plugins/expire/expire-tool.c b/src/plugins/expire/expire-tool.c
index c8211f8ee9..ed254ed274 100644
--- a/src/plugins/expire/expire-tool.c
+++ b/src/plugins/expire/expire-tool.c
@@ -230,8 +230,10 @@ static void expire_run(bool testrun)
 			/* we're no longer expunging old messages from here */
 			if (!testrun)
 				dict_unset(trans, key);
-			else
-				i_info("%s: removed from config", mailbox);
+			else {
+				i_info("%s: mailbox '%s' removed from config",
+				       userp, mailbox);
+			}
 			continue;
 		}
 		if (time(NULL) < (time_t)strtoul(value, NULL, 10)) {
@@ -239,7 +241,7 @@ static void expire_run(bool testrun)
 			   so stop processing */
 			if (testrun) {
 				i_info("%s: stop, expire time in future: %s",
-				       mailbox, value);
+				       userp, value);
 			}
 			break;
 		}
@@ -260,7 +262,7 @@ static void expire_run(bool testrun)
 			if (!testrun)
 				dict_unset(trans, key);
 			else
-				i_info("%s: no messages left", mailbox);
+				i_info("%s: no messages left", userp);
 		} else {
 			char new_value[MAX_INT_STRLEN];
 
@@ -274,7 +276,7 @@ static void expire_run(bool testrun)
 				dict_set(trans, key, new_value);
 			else {
 				i_info("%s: timestamp %s -> %s",
-				       mailbox, value, new_value);
+				       userp, value, new_value);
 			}
 		}
 	}