jetmore 2005/08/02 17:12:14 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exipick.src
Log:
Committed exipick version 20050802.0 (added message_exim_id)
Revision Changes Path
1.197 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.6 +6 -5 exim/exim-src/src/exipick.src
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- ChangeLog 2 Aug 2005 15:19:20 -0000 1.196
+++ ChangeLog 2 Aug 2005 16:12:14 -0000 1.197
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.196 2005/08/02 15:19:20 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.197 2005/08/02 16:12:14 jetmore Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -55,6 +55,8 @@
verification to occur when the EHLO/HELO command was issued. The ACL just
tested the remembered result. Now, if a previous verification attempt has
not happened, "verify = helo" does it there and then.
+
+JJ/01 exipick: added $message_exim_id variable (see 4.53-PH/04)
Exim version 4.52
Index: exipick.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exipick.src,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- exipick.src 7 Jun 2005 09:15:04 -0000 1.5
+++ exipick.src 2 Aug 2005 16:12:14 -0000 1.6
@@ -1,5 +1,5 @@
#!PERL_COMMAND
-# $Cambridge: exim/exim-src/src/exipick.src,v 1.5 2005/06/07 09:15:04 ph10 Exp $
+# $Cambridge: exim/exim-src/src/exipick.src,v 1.6 2005/08/02 16:12:14 jetmore Exp $
# This variable should be set by the building process to Exim's spool directory.
my $spool = 'SPOOL_DIRECTORY';
@@ -8,7 +8,7 @@
use Getopt::Long;
my($p_name) = $0 =~ m|/?([^/]+)$|;
-my $p_version = "20050604.1";
+my $p_version = "20050802.1";
my $p_usage = "Usage: $p_name [--help|--version] (see --help for details)";
my $p_cp = <<EOM;
Copyright (c) 2003-2005 John Jetmore <jj33\@pobox.com>
@@ -109,7 +109,7 @@
push(@local_crit, \%t);
}
}
- if ($G::show_tests) { print $e->get_var('message_id'), "\n"; }
+ if ($G::show_tests) { print $e->get_var('message_exim_id'), "\n"; }
CRITERIA:
foreach my $c (@$crit, @local_crit) {
my $var = $e->get_var($c->{var});
@@ -182,7 +182,7 @@
my $var = lc($1); my $op = $2; my $val = $3;
$val =~ s|^(['"])(.*)\1$|$2|;
push(@c, { var => $var, cmp => "(\"\$var\" $op \"$val\") ? 1 : 0" });
- if ($var eq 'message_id' && $op eq "eq") {
+ if (($var eq 'message_id' || $var eq 'message_exim_id') && $op eq "eq") {
#print STDERR "short circuit @c[-1]->{cmp} $val\n";
$G::msg_ids->{$val} = 1;
}
@@ -412,6 +412,7 @@
chomp($_ = <I>);
return(0) if ($self->{_message}.'-H' ne $_);
$self->{_vars}{message_id} = $self->{_message};
+ $self->{_vars}{message_exim_id} = $self->{_message};
# line 2
chomp($_ = <I>);
@@ -1110,9 +1111,9 @@
A concatenation of all the header lines except for lines added by routers or transports.
-=item . $message_id
+=item . $message_exim_id, $message_id
-The unique message id that is used by Exim to identify the message.
+The unique message id that is used by Exim to identify the message. $message_id is deprecated as of Exim 4.53.
=item + $originator_login
