# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1223215198 -10800
# Node ID cc5e5c43ebfe281ec285f66a031dfa19fcf71839
# Parent  d6d7a56f71609bd06b7746ec2f21eb3649a8dc02
expire-tool: --test now shows the username in info messages.

diff -r d6d7a56f7160 -r cc5e5c43ebfe src/plugins/expire/expire-tool.c
--- a/src/plugins/expire/expire-tool.c	Sun Oct 05 16:50:41 2008 +0300
+++ b/src/plugins/expire/expire-tool.c	Sun Oct 05 16:59:58 2008 +0300
@@ -230,8 +230,10 @@
 			/* 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 @@
 			   so stop processing */
 			if (testrun) {
 				i_info("%s: stop, expire time in future: %s",
-				       mailbox, value);
+				       userp, value);
 			}
 			break;
 		}
@@ -260,7 +262,7 @@
 			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 @@
 				dict_set(trans, key, new_value);
 			else {
 				i_info("%s: timestamp %s -> %s",
-				       mailbox, value, new_value);
+				       userp, value, new_value);
 			}
 		}
 	}