Attachment #92093 for bug #129670

View | Details | Raw Unified | Return to bug 129670
Collapse All | Expand All

Lines 7-14 Link Here

(-)./Makefile 2008-12-15 13:18:57.000000000 -0500 (-2 / +1 lines)
7	# Based on amavisd ports makefile.	7	# Based on amavisd ports makefile.
8		8
9	PORTNAME= amavisd-new	9	PORTNAME= amavisd-new
10	PORTVERSION= 2.6.1	10	PORTVERSION= 2.6.2
11	PORTREVISION= 1
12	PORTEPOCH= 1	11	PORTEPOCH= 1
13	CATEGORIES= security	12	CATEGORIES= security
14	MASTER_SITES= http://www.ijs.si/software/amavisd/ \	13	MASTER_SITES= http://www.ijs.si/software/amavisd/ \

Lines 1-3 Link Here

(-)./distinfo 2008-12-15 13:20:36.000000000 -0500 (-3 / +3 lines)
1	MD5 (amavisd-new-2.6.1.tar.gz) = 2474d4c034f96a58e5b8af91af514689	1	MD5 (amavisd-new-2.6.2.tar.gz) = 0b3b0ef8771af8e4a950e7381d42adbd
2	SHA256 (amavisd-new-2.6.1.tar.gz) = 4c98786e4b694459f6bac42413cd34b7d0165763b908b3234d5407126fb3b13d	2	SHA256 (amavisd-new-2.6.2.tar.gz) = bf5a04617081a210917809f7eb640f3112f030e772adcba66952174b37423517
3	SIZE (amavisd-new-2.6.1.tar.gz) = 911740	3	SIZE (amavisd-new-2.6.2.tar.gz) = 903818





+++ amavisd    2008-09-22 11:23:53.000000000 +0200
@@ -16878,13 +16878,18 @@
       $data_command_accepted = $smtp_resp=~/^3/ ? 1 : 0;
       if (!$data_command_accepted) {
         do_log(0,"Negative SMTP resp. to DATA: %s", $smtp_resp);
+      $in_datasend_mode = 0; 
+      $smtp_session->timeout($smtp_rset_timeout); 
+      $what_cmd = 'RSET';  $smtp_handle->rset;  # send a RSET 
       } elsif (!$any_valid_recips) {  # pipelining
         do_log(2,"Too late, DATA accepted but no valid recips, send dummy");
         $which_section = 'fwd-data-contents';
         $smtp_session->timeout(
-          max(60,min($smtp_data_xfer_timeout,$deadline-time)));
+        max(60,min($smtp_data_done_timeout,$deadline-time))); 
+      $what_cmd = 'data-dot'; 
         $smtp_handle->dataend;  # as required by rfc2920: if the DATA command
                       # was accepted the SMTP client should send a single dot
+      $in_datasend_mode = 0;
       } elsif ($any_tempfail_recips && !$dsn_per_recip_capable) {  # pipelining
         # we must not proceed if mail did not came in as LMTP,
         # or we would generate mail duplicates on each delivery attempt

Return to bug 129670

Lines 1-22 Link Here

(-)./files/patch-amavisd 2008-12-15 13:27:56.000000000 -0500 (-22 / +1 lines)
1	--- amavisd.orig 2008-09-22 11:21:15.000000000 +0200	1
2	+++ amavisd 2008-09-22 11:23:53.000000000 +0200
3	@@ -16878,13 +16878,18 @@
4	$data_command_accepted = $smtp_resp=~/^3/ ? 1 : 0;
5	if (!$data_command_accepted) {
6	do_log(0,"Negative SMTP resp. to DATA: %s", $smtp_resp);
7	+ $in_datasend_mode = 0;
8	+ $smtp_session->timeout($smtp_rset_timeout);
9	+ $what_cmd = 'RSET'; $smtp_handle->rset; # send a RSET
10	} elsif (!$any_valid_recips) { # pipelining
11	do_log(2,"Too late, DATA accepted but no valid recips, send dummy");
12	$which_section = 'fwd-data-contents';
13	$smtp_session->timeout(
14	- max(60,min($smtp_data_xfer_timeout,$deadline-time)));
15	+ max(60,min($smtp_data_done_timeout,$deadline-time)));
16	+ $what_cmd = 'data-dot';
17	$smtp_handle->dataend; # as required by rfc2920: if the DATA command
18	# was accepted the SMTP client should send a single dot
19	+ $in_datasend_mode = 0;
20	} elsif ($any_tempfail_recips && !$dsn_per_recip_capable) { # pipelining
21	# we must not proceed if mail did not came in as LMTP,
22	# or we would generate mail duplicates on each delivery attempt