Please unblock mysqmail 0.4.9-6 (bugfix: #599569 & #599570)

[Thomas Goirand <zigo@debian.org>]

Dear RT,

I have fixed 2 important bug in mysqmail-dovecot-logger. One of them is
a mis-match between the PID file creation in mysqmail-dovecot-logger.c
and it's corresponding init.d script, the second one is that
mysqmail-dovecot-logger.c was happening "):" in the domain names that it
logged.

I have attached the relevant part of the diff file between 0.4.9-6 and
0.4.9-7 (which doesn't include the debian/changelog modification).

It would be great if this fix could reach Squeeze. Please unblock. Thanks.

Thomas Goirand (zigo)

--- mysqmail-0.4.9.orig/mysqmail-dovecot-logger.c
+++ mysqmail-0.4.9/mysqmail-dovecot-logger.c
@@ -124,6 +124,9 @@
 		domain++; //shift past the @ to get the domain
 	}
 
+	// Strip off the last 2 chars of the domain name which are "):"
+	domain[strlen(domain) - 2] = 0;
+
 	// *** Calculate the total traffic for the session ***
 	mysqmail_bytes = 0;
 
@@ -213,7 +216,7 @@
 	daemonize();
 	setlogmask (LOG_UPTO (LOG_NOTICE));
 	openlog(DAEMON_NAME, LOG_NDELAY | LOG_CONS | LOG_PID, LOG_LOCAL1);
-	write_pidfile("mysqmail-dov-logger");
+	write_pidfile("mysqmail-dovecot-logger");
 	reg_hand();
 
 	read_config_file();