log email addresses as utf8 (postfix also do that).

diff --git a/PMG/RuleDB/Accept.pm b/PMG/RuleDB/Accept.pm
index aace3d3bd59877d269a951dc4beaac33ee60f320..295692799b1e31f8c736f59febc2d15f7b68bea0 100644 (file)
--- a/PMG/RuleDB/Accept.pm
+++ b/PMG/RuleDB/Accept.pm
@@ -3,6 +3,7 @@ package PMG::RuleDB::Accept;
 use strict;
 use warnings;
 use DBI;
+use Encode;
 
 use PVE::SafeSyslog;
 use Digest::SHA;
@@ -110,12 +111,12 @@ sub execute {
                $msginfo->{xforward}, $msginfo->{fqdn});
            if ($qid) {
                foreach (@$tg) {
-                   syslog('info', "%s: accept mail to <%s> (%s)", $queue->{logid}, $_, $qid);
+                   syslog('info', "%s: accept mail to <%s> (%s)", $queue->{logid}, encode('UTF-8', $_), $qid);
                }
                $queue->set_status ($tg, 'delivered', $qid);
            } else {
                foreach (@$tg) {
-                   syslog('err', "%s: reinject mail to <%s> failed", $queue->{logid}, $_);
+                   syslog('err', "%s: reinject mail to <%s> failed", $queue->{logid}, encode('UTF-8', $_));
                }
                if ($code) {
                    my $resp = substr($code, 0, 1);

diff --git a/PMG/RuleDB/Block.pm b/PMG/RuleDB/Block.pm
index 6c727d8f29f0ac75798a9d56a91153cb9db89404..81f00b9f7019df416eb8c2cdf10ad696d12127ba 100644 (file)
--- a/PMG/RuleDB/Block.pm
+++ b/PMG/RuleDB/Block.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use DBI;
 use Digest::SHA;
+use Encode;
 
 use PVE::SafeSyslog;
 
@@ -95,7 +96,7 @@ sub execute {
     }
 
     foreach my $to (@$targets) {
-       syslog('info', "%s: block mail to <%s>", $queue->{logid}, $to);
+       syslog('info', "%s: block mail to <%s>", $queue->{logid}, encode('UTF-8', $to));
     }
 
     $queue->set_status($targets, 'blocked');