--- nfo/perl/libs/Mail/Audit/Dispatch.pm	2003/03/23 21:12:20	1.6
+++ nfo/perl/libs/Mail/Audit/Dispatch.pm	2003/03/23 22:26:22	1.7
@@ -5,10 +5,13 @@
 #    with the Perl-module "Mail::Audit" 
 #    available from CPAN.
 #
-#  $Id: Dispatch.pm,v 1.6 2003/03/23 21:12:20 root Exp $
+#  $Id: Dispatch.pm,v 1.7 2003/03/23 22:26:22 root Exp $
 #
 # ============================================================
 #  $Log: Dispatch.pm,v $
+#  Revision 1.7  2003/03/23 22:26:22  root
+#  + header-field 'Message-ID' now included when tracing
+#
 #  Revision 1.6  2003/03/23 21:12:20  root
 #  + sub jerror and related modifications
 #
@@ -100,8 +103,8 @@
   $self->{settings}->{RULESFILE} = "$self->{settings}->{HOME}/.dispatchmailrc";
   #$self->{settings}->{LOCKFILE}  = "$self->{settings}->{HOME}/.procmail.lockfile";
   $self->{settings}->{LOCKFILE}  = "$self->{settings}->{HOME}/.dispatchmail.lockfile";
-  $self->{settings}->{LOGFILE}   = "$self->{settings}->{MAILDIR}/.dispatchmail.log";
-  $self->{settings}->{ERRLOG}    = ".dispatchmail-errors.log";
+  $self->{settings}->{LOGFILE}   = "$self->{settings}->{MAILDIR}/.mail-delivery.log";
+  $self->{settings}->{ERRLOG}    = ".mail-delivery_errors.log";
   $self->{settings}->{DEFAULT}   = "$self->{settings}->{MAILDIR}/Inbox";
 }
 
@@ -214,9 +217,10 @@
   sub traceEntry {
     my $self = shift;
     $self->appendLog('-' x 40 . '  TRACE  ' . '-' x 10);
-    $self->appendLog("From:    " . get_chomped($self->{incoming}->from));
-    $self->appendLog("To:      " . get_chomped($self->{incoming}->to));
-    $self->appendLog("Subject: " . get_chomped($self->{incoming}->subject));
+    $self->appendLog("From:       " . get_chomped($self->{incoming}->from));
+    $self->appendLog("To:         " . get_chomped($self->{incoming}->to));
+    $self->appendLog("Subject:    " . get_chomped($self->{incoming}->subject));
+    $self->appendLog("Message-ID: " . get_chomped($self->{incoming}->get('Message-ID')));
     $self->appendLog('-' x 40 . '  TRACE  ' . '-' x 10);
   }