ph10 2007/07/04 11:37:04 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src smtp_in.c
exim-test runtest
exim-test/confs 0046
Removed files:
exim-test/aux-fixed 0046.filter.userx
Log:
Remove unwanted (int) case when reading SIZE. Fix runtest for 64-bit
systems. Tidy obsolete stuff in test 46.
Revision Changes Path
1.521 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.59 +1 -1 exim/exim-src/src/smtp_in.c
1.2 +0 -4 exim/exim-test/aux-fixed/0046.filter.userx (dead)
1.2 +0 -6 exim/exim-test/confs/0046
1.28 +6 -0 exim/exim-test/runtest
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- ChangeLog 27 Jun 2007 11:01:51 -0000 1.520
+++ ChangeLog 4 Jul 2007 10:37:03 -0000 1.521
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.520 2007/06/27 11:01:51 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.521 2007/07/04 10:37:03 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -75,6 +75,9 @@
way in which PCRE > 7.0 is built.
PH/14 Implemented queue_only_load_latch.
+
+PH/15 Removed an incorrect (int) cast when reading the value of SIZE in a
+ MAIL command. The effect was to mangle the value on 64-bit systems.
Exim version 4.67
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- smtp_in.c 16 Apr 2007 11:17:13 -0000 1.58
+++ smtp_in.c 4 Jul 2007 10:37:03 -0000 1.59
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.58 2007/04/16 11:17:13 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.59 2007/07/04 10:37:03 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -3134,7 +3134,7 @@
in order to be able to log the sender address on failure. */
if (strcmpic(name, US"SIZE") == 0 &&
- ((size = (int)Ustrtoul(value, &end, 10)), *end == 0))
+ ((size = Ustrtoul(value, &end, 10)), *end == 0))
{
if ((size == ULONG_MAX && errno == ERANGE) || size > INT_MAX)
size = INT_MAX;
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test/runtest,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- runtest 14 Jun 2007 13:20:38 -0000 1.27
+++ runtest 4 Jul 2007 10:37:04 -0000 1.28
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/exim-test/runtest,v 1.27 2007/06/14 13:20:38 ph10 Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.28 2007/07/04 10:37:04 ph10 Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -489,6 +489,12 @@
# ======== General uids, gids, and pids ========
# Note: this must come after munges for caller's and exim's uid/gid
+
+ # These are for systems where long int is 64
+ s/\buid=4294967295/uid=-1/;
+ s/\beuid=4294967295/euid=-1/;
+ s/\bgid=4294967295/gid=-1/;
+ s/\begid=4294967295/egid=-1/;
s/\bgid=\d+/gid=gggg/;
s/\begid=\d+/egid=gggg/;
Index: 0046
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0046,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0046 7 Feb 2006 10:34:25 -0000 1.1
+++ 0046 4 Jul 2007 10:37:04 -0000 1.2
@@ -21,12 +21,6 @@
begin routers
-forwardfile:
- driver = redirect
- allow_filter
- check_local_user
- file = DIR/aux-fixed/TESTNUM.filter.$local_part
-
localuser:
driver = accept
local_parts = userx
