ph10 2005/08/02 12:22:24 BST
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src ACKNOWLEDGMENTS
exim-src/src deliver.c globals.c globals.h
exim-src/src/transports lmtp.c lmtp.h smtp.c smtp.h
exim-test-orig/AutoTest/confs 002 200 244
exim-test-orig/AutoTest/log 200 244
exim-test-orig/AutoTest/scripts 200 244
exim-test-orig/AutoTest/stdout 001 002 244 454
Added files:
exim-test-orig/AutoTest/aux 200.script.08 200.script.09
Log:
Add support for the IGNOREQUOTA extension to LMTP, both to the lmtp
transport and to the smtp transport.
Revision Changes Path
1.193 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.60 +9 -0 exim/exim-doc/doc-txt/NewStuff
1.30 +1 -0 exim/exim-src/ACKNOWLEDGMENTS
1.22 +9 -0 exim/exim-src/src/deliver.c
1.32 +1 -0 exim/exim-src/src/globals.c
1.23 +1 -0 exim/exim-src/src/globals.h
1.6 +14 -3 exim/exim-src/src/transports/lmtp.c
1.3 +1 -0 exim/exim-src/src/transports/lmtp.h
1.15 +20 -2 exim/exim-src/src/transports/smtp.c
1.6 +1 -0 exim/exim-src/src/transports/smtp.h
1.1 +17 -0 exim/exim-test-orig/AutoTest/aux/200.script.08 (new)
1.1 +18 -0 exim/exim-test-orig/AutoTest/aux/200.script.09 (new)
1.11 +2 -0 exim/exim-test-orig/AutoTest/confs/002
1.2 +3 -0 exim/exim-test-orig/AutoTest/confs/200
1.2 +3 -0 exim/exim-test-orig/AutoTest/confs/244
1.3 +73 -0 exim/exim-test-orig/AutoTest/log/200
1.4 +10 -0 exim/exim-test-orig/AutoTest/log/244
1.2 +10 -0 exim/exim-test-orig/AutoTest/scripts/200
1.2 +57 -0 exim/exim-test-orig/AutoTest/scripts/244
1.15 +2 -0 exim/exim-test-orig/AutoTest/stdout/001
1.12 +4 -0 exim/exim-test-orig/AutoTest/stdout/002
1.2 +61 -0 exim/exim-test-orig/AutoTest/stdout/244
1.2 +2 -0 exim/exim-test-orig/AutoTest/stdout/454
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- ChangeLog 2 Aug 2005 09:24:45 -0000 1.192
+++ ChangeLog 2 Aug 2005 11:22:23 -0000 1.193
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.192 2005/08/02 09:24:45 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.193 2005/08/02 11:22:23 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -39,6 +39,9 @@
PH/10 Named domain lists were not working if used in a queue_smtp_domains
setting.
+
+PH/11 Added support for the IGNOREQUOTA extension to LMTP, both to the lmtp
+ transport and to the smtp transport in LMTP mode.
Exim version 4.52
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- NewStuff 1 Aug 2005 15:01:12 -0000 1.59
+++ NewStuff 2 Aug 2005 11:22:23 -0000 1.60
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.59 2005/08/01 15:01:12 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.60 2005/08/02 11:22:23 ph10 Exp $
New Features in Exim
--------------------
@@ -52,6 +52,15 @@
PH/03 The use of forbid_filter_existstest now also locks out the use of the
${stat: expansion item.
+
+PH/04 The IGNOREQUOTA extension to the LMTP protocol is now available in both
+ the lmtp transport and the smtp transport running in LMTP mode. In the
+ lmtp transport there is a new Boolean option called ignore_quota, and in
+ the smtp transport there is a new Boolean option called
+ lmtp_ignore_quota. If either of these options is set TRUE, the string
+ "IGNOREQUOTA" is added to RCPT commands when using the LMTP protocol,
+ provided that the server has advertised support for IGNOREQUOTA in its
+ response to the LHLO command.
Exim version 4.52
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ACKNOWLEDGMENTS 1 Aug 2005 13:20:28 -0000 1.29
+++ ACKNOWLEDGMENTS 2 Aug 2005 11:22:23 -0000 1.30
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.29 2005/08/01 13:20:28 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.30 2005/08/02 11:22:23 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -210,6 +210,7 @@
Stephan Schulz Patch for $host_data caching error
Tony Sheen Log files with datestamped names and auto rollover
Martin Sluka Patch for exigrep to include non-message lines
+Adam Stephens Suggested patch for IGNOREQUOTA in LMTP
Russell Stuart Diagnosis of obscure batch multiple delivery bug
Tamas Tevesz Patch for crypt16() support
Johan Thelmen Support for the F-Secure virus scanner
Index: deliver.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- deliver.c 28 Jun 2005 10:23:35 -0000 1.21
+++ deliver.c 2 Aug 2005 11:22:24 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/deliver.c,v 1.21 2005/06/28 10:23:35 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/deliver.c,v 1.22 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -5855,6 +5855,15 @@
deliveries are done first, then remote ones. If ever the problems of how to
handle fallback transports are figured out, this section can be put into a loop
for handling fallbacks, though the uid switching will have to be revised. */
+
+/* Precompile a regex that is used to recognize a parameter in response
+to an LHLO command, if is isn't already compiled. This may be used on both
+local and remote LMTP deliveries. */
+
+if (regex_IGNOREQUOTA == NULL) regex_IGNOREQUOTA =
+ regex_must_compile(US"\\n250[\\s\\-]IGNOREQUOTA(\\s|\\n|$)", FALSE, TRUE);
+
+/* Handle local deliveries */
if (addr_local != NULL)
{
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- globals.c 1 Aug 2005 14:00:35 -0000 1.31
+++ globals.c 2 Aug 2005 11:22:24 -0000 1.32
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.31 2005/08/01 14:00:35 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.32 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -840,6 +840,7 @@
const pcre *regex_AUTH = NULL;
const pcre *regex_check_dns_names = NULL;
const pcre *regex_From = NULL;
+const pcre *regex_IGNOREQUOTA = NULL;
const pcre *regex_PIPELINING = NULL;
const pcre *regex_SIZE = NULL;
const pcre *regex_ismsgid = NULL;
Index: globals.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- globals.h 21 Jun 2005 14:14:55 -0000 1.22
+++ globals.h 2 Aug 2005 11:22:24 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.h,v 1.22 2005/06/21 14:14:55 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.h,v 1.23 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -542,6 +542,7 @@
extern const pcre *regex_AUTH; /* For recognizing AUTH settings */
extern const pcre *regex_check_dns_names; /* For DNS name checking */
extern const pcre *regex_From; /* For recognizing "From_" lines */
+extern const pcre *regex_IGNOREQUOTA; /* For recognizing IGNOREQUOTA (LMTP) */
extern const pcre *regex_PIPELINING; /* For recognizing PIPELINING */
extern const pcre *regex_SIZE; /* For recognizing SIZE settings */
extern const pcre *regex_ismsgid; /* Compiled r.e. for message it */
Index: lmtp.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/lmtp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lmtp.c 27 Jun 2005 14:29:44 -0000 1.5
+++ lmtp.c 2 Aug 2005 11:22:24 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/lmtp.c,v 1.5 2005/06/27 14:29:44 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/lmtp.c,v 1.6 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -28,6 +28,8 @@
(void *)offsetof(transport_instance, batch_max) },
{ "command", opt_stringptr,
(void *)offsetof(lmtp_transport_options_block, cmd) },
+ { "ignore_quota", opt_bool,
+ (void *)offsetof(lmtp_transport_options_block, ignore_quota) },
{ "socket", opt_stringptr,
(void *)offsetof(lmtp_transport_options_block, skt) },
{ "timeout", opt_time,
@@ -46,7 +48,8 @@
NULL, /* cmd */
NULL, /* skt */
5*60, /* timeout */
- 0 /* options */
+ 0, /* options */
+ FALSE /* ignore_quota */
};
@@ -457,6 +460,7 @@
BOOL send_data;
BOOL yield = FALSE;
address_item *addr;
+uschar *igquotstr = US"";
uschar *sockname = NULL;
uschar **argv;
uschar buffer[256];
@@ -561,6 +565,13 @@
if (!lmtp_read_response(out, buffer, sizeof(buffer), '2',
timeout)) goto RESPONSE_FAILED;
+/* If the ignore_quota option is set, note whether the server supports the
+IGNOREQUOTA option, and if so, set an appropriate addition for RCPT. */
+
+if (ob->ignore_quota)
+ igquotstr = (pcre_exec(regex_IGNOREQUOTA, NULL, CS buffer,
+ Ustrlen(CS buffer), 0, PCRE_EOPT, NULL, 0) >= 0)? US" IGNOREQUOTA" : US"";
+
/* Now the envelope sender */
if (!lmtp_write_command(fd_in, "MAIL FROM:<%s>\r\n", return_path))
@@ -575,8 +586,8 @@
send_data = FALSE;
for (addr = addrlist; addr != NULL; addr = addr->next)
{
- if (!lmtp_write_command(fd_in, "RCPT TO:<%s>\r\n",
- transport_rcpt_address(addr, tblock->rcpt_include_affixes)))
+ if (!lmtp_write_command(fd_in, "RCPT TO:<%s>%s\r\n",
+ transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr))
goto WRITE_FAILED;
if (lmtp_read_response(out, buffer, sizeof(buffer), '2', timeout))
{
Index: lmtp.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/lmtp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lmtp.h 4 Jan 2005 10:00:45 -0000 1.2
+++ lmtp.h 2 Aug 2005 11:22:24 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/lmtp.h,v 1.2 2005/01/04 10:00:45 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/lmtp.h,v 1.3 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -14,6 +14,7 @@
uschar *skt;
int timeout;
int options;
+ BOOL ignore_quota;
} lmtp_transport_options_block;
/* Data for reading the private options. */
Index: smtp.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- smtp.c 2 Aug 2005 09:24:45 -0000 1.14
+++ smtp.c 2 Aug 2005 11:22:24 -0000 1.15
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.14 2005/08/02 09:24:45 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.15 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -93,6 +93,8 @@
(void *)offsetof(smtp_transport_options_block, interface) },
{ "keepalive", opt_bool,
(void *)offsetof(smtp_transport_options_block, keepalive) },
+ { "lmtp_ignore_quota", opt_bool,
+ (void *)offsetof(smtp_transport_options_block, lmtp_ignore_quota) },
{ "max_rcpt", opt_int | opt_public,
(void *)offsetof(transport_instance, max_addresses) },
{ "multi_domain", opt_bool | opt_public,
@@ -163,6 +165,7 @@
FALSE, /* hosts_override */
FALSE, /* hosts_randomize */
TRUE, /* keepalive */
+ FALSE, /* lmtp_ignore_quota */
TRUE /* retry_include_ip_address */
#ifdef SUPPORT_TLS
,NULL, /* tls_certificate */
@@ -796,6 +799,7 @@
smtp_inblock inblock;
smtp_outblock outblock;
int max_rcpt = tblock->max_addresses;
+uschar *igquotstr = US"";
uschar *local_authenticated_sender = authenticated_sender;
uschar *helo_data;
uschar *message = NULL;
@@ -947,6 +951,13 @@
ob->command_timeout)) goto RESPONSE_FAILED;
}
+ /* Set IGNOREQUOTA if the response to LHLO specifies support and the
+ lmtp_ignore_quota option was set. */
+
+ igquotstr = (lmtp && ob->lmtp_ignore_quota &&
+ pcre_exec(regex_IGNOREQUOTA, NULL, CS buffer, Ustrlen(CS buffer), 0,
+ PCRE_EOPT, NULL, 0) >= 0)? US" IGNOREQUOTA" : US"";
+
/* Set tls_offered if the response to EHLO specifies support for STARTTLS. */
#ifdef SUPPORT_TLS
@@ -1081,6 +1092,13 @@
int require_auth;
uschar *fail_reason = US"server did not advertise AUTH support";
+ /* Set for IGNOREQUOTA if the response to LHLO specifies support and the
+ lmtp_ignore_quota option was set. */
+
+ igquotstr = (lmtp && ob->lmtp_ignore_quota &&
+ pcre_exec(regex_IGNOREQUOTA, NULL, CS buffer, Ustrlen(CS buffer), 0,
+ PCRE_EOPT, NULL, 0) >= 0)? US" IGNOREQUOTA" : US"";
+
/* If the response to EHLO specified support for the SIZE parameter, note
this, provided size_addition is non-negative. */
@@ -1343,8 +1361,8 @@
yield as OK, because this error can often mean that there is a problem with
just one address, so we don't want to delay the host. */
- count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>\r\n",
- transport_rcpt_address(addr, tblock->rcpt_include_affixes));
+ count = smtp_write_command(&outblock, no_flush, "RCPT TO:<%s>%s\r\n",
+ transport_rcpt_address(addr, tblock->rcpt_include_affixes), igquotstr);
if (count < 0) goto SEND_FAILED;
if (count > 0)
{
Index: smtp.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/transports/smtp.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smtp.h 8 Mar 2005 15:32:02 -0000 1.5
+++ smtp.h 2 Aug 2005 11:22:24 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/transports/smtp.h,v 1.5 2005/03/08 15:32:02 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/transports/smtp.h,v 1.6 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -41,6 +41,7 @@
BOOL hosts_override;
BOOL hosts_randomize;
BOOL keepalive;
+ BOOL lmtp_ignore_quota;
BOOL retry_include_ip_address;
#ifdef SUPPORT_TLS
uschar *tls_certificate;
Index: 200.script.08
====================================================================
220 Welcome to this LMTP simulation
LHLO
250-Hello there
250 SIZE
MAIL FROM
250 OK
RCPT TO
250 OK
RCPT TO
250 OK
DATA
354 GO AHEAD
.
250 OK
250 OK
QUIT
220 OK
Index: 200.script.09
====================================================================
220 Welcome to this LMTP simulation
LHLO
250-Hello there
250-IGNOREQUOTA
250 SIZE
MAIL FROM
250 OK
RCPT TO
250 OK
RCPT TO
250 OK
DATA
354 GO AHEAD
.
250 OK
250 OK
QUIT
220 OK
Index: 002
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/002,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- 002 21 Jun 2005 14:14:55 -0000 1.10
+++ 002 2 Aug 2005 11:22:24 -0000 1.11
@@ -856,6 +856,7 @@
multi_domain
port = 25
protocol = lmtp
+ lmtp_ignore_quota
retry_include_ip_address
no_return_path_add
serialize_hosts =
@@ -882,6 +883,7 @@
headers_add =
no_headers_only
headers_remove =
+ ignore_quota
no_initgroups
message_size_limit = 0
retry_use_local_part
Index: 200
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/200,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 200 8 Oct 2004 14:49:15 -0000 1.1
+++ 200 2 Aug 2005 11:22:24 -0000 1.2
@@ -1,5 +1,7 @@
# Exim test configuration 200
+IGNORE_QUOTA=FALSE
+
# Macros are set externally in order to get the path
# of the Exim that is being tested, and the directory
# in which the test data lives.
@@ -40,6 +42,7 @@
command = DIR/mtpscript DIR/aux/200.script.$h_script: +DIR/spool/log/mainlog
timeout = 1s
user = exim
+ ignore_quota = IGNORE_QUOTA
# ----- Retry -----
Index: 244
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/244,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 244 8 Oct 2004 14:49:15 -0000 1.1
+++ 244 2 Aug 2005 11:22:24 -0000 1.2
@@ -1,5 +1,7 @@
# Exim test configuration 244
+IGNORE_QUOTA=false
+
# Macros are set externally in order to get the path
# of the Exim that is being tested, and the directory
# in which the test data lives.
@@ -41,6 +43,7 @@
hosts = 127.0.0.1
port = 1225
protocol = LMTP
+ lmtp_ignore_quota = IGNORE_QUOTA
# ----- Retry -----
Index: 200
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/200,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 200 28 Apr 2005 13:06:33 -0000 1.2
+++ 200 2 Aug 2005 11:22:24 -0000 1.3
@@ -173,3 +173,76 @@
1999-03-02 09:44:33 10HmbG-0005vi-00 == tom@??? R=smartuser T=lmtp defer (-1): LMTP timeout after DATA
1999-03-02 09:44:33 10HmbG-0005vi-00 == dick@??? R=smartuser T=lmtp defer (-1): LMTP timeout after DATA
1999-03-02 09:44:33 10HmbG-0005vi-00 == harry@??? R=smartuser T=lmtp defer (-1): LMTP timeout after DATA
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= ph10@??? U=ph10 P=local S=277
+220 Welcome to this LMTP simulation
+LHLO
+<<< LHLO myhost.test.ex
+250-Hello there
+250 SIZE
+MAIL FROM
+<<< MAIL FROM:<ph10@???>
+250 OK
+RCPT TO
+<<< RCPT TO:<jack@???>
+250 OK
+RCPT TO
+<<< RCPT TO:<jill@???>
+250 OK
+DATA
+<<< DATA
+354 GO AHEAD
+.
+<<< Received: from ph10 by myhost.test.ex with local (Exim x.yz)
+<<< id 10HmbH-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+<<< script: 08
+<<< Message-Id: <E10HmbH-0005vi-00@???>
+<<< From: Philip Hazel <ph10@???>
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
+<<<
+<<< This is a test message.
+<<< .
+250 OK
+250 OK
+QUIT
+<<< QUIT
+220 OK
+1999-03-02 09:44:33 10HmbH-0005vi-00 => jack <jack@???> R=smartuser T=lmtp
+1999-03-02 09:44:33 10HmbH-0005vi-00 -> jill <jill@???> R=smartuser T=lmtp
+1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= ph10@??? U=ph10 P=local S=277
+220 Welcome to this LMTP simulation
+LHLO
+<<< LHLO myhost.test.ex
+250-Hello there
+250-IGNOREQUOTA
+250 SIZE
+MAIL FROM
+<<< MAIL FROM:<ph10@???>
+250 OK
+RCPT TO
+<<< RCPT TO:<jack@???> IGNOREQUOTA
+250 OK
+RCPT TO
+<<< RCPT TO:<jill@???> IGNOREQUOTA
+250 OK
+DATA
+<<< DATA
+354 GO AHEAD
+.
+<<< Received: from ph10 by myhost.test.ex with local (Exim x.yz)
+<<< id 10HmbI-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+<<< script: 09
+<<< Message-Id: <E10HmbI-0005vi-00@???>
+<<< From: Philip Hazel <ph10@???>
+<<< Date: Tue, 2 Mar 1999 09:44:33 +0000
+<<<
+<<< This is a test message.
+<<< .
+250 OK
+250 OK
+QUIT
+<<< QUIT
+220 OK
+1999-03-02 09:44:33 10HmbI-0005vi-00 => jack <jack@???> R=smartuser T=lmtp
+1999-03-02 09:44:33 10HmbI-0005vi-00 -> jill <jill@???> R=smartuser T=lmtp
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
Index: 244
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/244,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 244 28 Apr 2005 13:06:33 -0000 1.3
+++ 244 2 Aug 2005 11:22:24 -0000 1.4
@@ -35,3 +35,13 @@
1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbC-0005vi-00 U=exim P=local S=1387
1999-03-02 09:44:33 10HmbD-0005vi-00 => :blackhole: <ph10@???> R=bounces
1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= ph10@??? U=ph10 P=local S=266
+1999-03-02 09:44:33 10HmbE-0005vi-00 => jack@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbE-0005vi-00 -> jill@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbE-0005vi-00 -> tom@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=266
+1999-03-02 09:44:33 10HmbF-0005vi-00 => jack@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbF-0005vi-00 -> jill@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbF-0005vi-00 -> tom@??? F=<ph10@???> R=smartuser T=lmtp H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
Index: 200
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/200,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 200 8 Oct 2004 14:49:52 -0000 1.1
+++ 200 2 Aug 2005 11:22:24 -0000 1.2
@@ -36,4 +36,14 @@
script: 07
This is a test message.
****
+0
+exim -odi -DIGNORE_QUOTA=true jack jill
+script: 08
+This is a test message.
+****
+0
+exim -odi -DIGNORE_QUOTA=true jack jill
+script: 09
+This is a test message.
+****
no_msglog_check
Index: 244
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/244,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 244 8 Oct 2004 14:49:52 -0000 1.1
+++ 244 2 Aug 2005 11:22:24 -0000 1.2
@@ -143,4 +143,61 @@
exim -odi ph10 jack jill tom dick harry
This is a test message.
****
+# This is to test the ignore_quota feature; first time we don't support it.
+0
+server 1225
+220 ESMTP
+LHLO
+250-OK
+250 HELP
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Receiver OK
+RCPT TO:
+250 Receiver OK
+RCPT TO:
+250 Receiver OK
+DATA
+354 Send it
+.
+250 OK
+250 OK
+250 OK
+QUIT
+250 OK
+****
+0
+exim -odi -DIGNORE_QUOTA=true jack jill tom
+This is a test message.
+****
+# This is to test the ignore_quota feature; second time we do support it
+0
+server 1225
+220 ESMTP
+LHLO
+250-OK
+250-IGNOREQUOTA
+250 HELP
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Receiver OK
+RCPT TO:
+250 Receiver OK
+RCPT TO:
+250 Receiver OK
+DATA
+354 Send it
+.
+250 OK
+250 OK
+250 OK
+QUIT
+250 OK
+****
+0
+exim -odi -DIGNORE_QUOTA=true jack jill tom
+This is a test message.
+****
no_msglog_check
Index: 001
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/001,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- 001 1 Aug 2005 14:00:35 -0000 1.14
+++ 001 2 Aug 2005 11:22:24 -0000 1.15
@@ -745,6 +745,7 @@
hosts_try_auth =
interface =
keepalive
+no_lmtp_ignore_quota
max_rcpt = 100
multi_domain
port = smtp
@@ -787,6 +788,7 @@
batch_id =
batch_max = 1
command = /source/exim4/AutoTest/mtpscript /source/exim4/AutoTest/aux/200.script.$h_script: +/source/exim4/AutoTest/spool/log/mainlog
+no_ignore_quota
socket =
timeout = 1s
Index: 002
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/002,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- 002 21 Jun 2005 14:14:56 -0000 1.11
+++ 002 2 Aug 2005 11:22:24 -0000 1.12
@@ -1346,6 +1346,7 @@
hosts_try_auth = *
interface = 127.0.0.1
keepalive
+lmtp_ignore_quota
max_rcpt = 0
multi_domain
port = 25
@@ -1388,6 +1389,7 @@
batch_id = rhubarb
batch_max = 100
command = <value not displayable>
+ignore_quota
socket =
timeout = 1s
@@ -1419,6 +1421,7 @@
batch_id =
batch_max = 1
command = <value not displayable>
+no_ignore_quota
socket = /some/socket
timeout = 5m
mysql_servers = localhost///
@@ -1449,5 +1452,6 @@
batch_id = rhubarb
batch_max = 100
command = /home/ph10/exim/AutoTest/mtpscript
+ignore_quota
socket =
timeout = 1s
Index: 244
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/244,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 244 8 Oct 2004 14:50:13 -0000 1.1
+++ 244 2 Aug 2005 11:22:24 -0000 1.2
@@ -150,3 +150,64 @@
QUIT
250 OK
End of script
+Listening on port 1225 ...
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250 HELP
+MAIL FROM:<ph10@???>
+250 Sender OK
+RCPT TO:<jack@???>
+250 Receiver OK
+RCPT TO:<jill@???>
+250 Receiver OK
+RCPT TO:<tom@???>
+250 Receiver OK
+DATA
+354 Send it
+Received: from ph10 by myhost.test.ex with local (Exim x.yz)
+ id 10HmbE-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-0005vi-00@???>
+From: Philip Hazel <ph10@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1225 ...
+Connection request from [127.0.0.1]
+220 ESMTP
+LHLO myhost.test.ex
+250-OK
+250-IGNOREQUOTA
+250 HELP
+MAIL FROM:<ph10@???>
+250 Sender OK
+RCPT TO:<jack@???> IGNOREQUOTA
+250 Receiver OK
+RCPT TO:<jill@???> IGNOREQUOTA
+250 Receiver OK
+RCPT TO:<tom@???> IGNOREQUOTA
+250 Receiver OK
+DATA
+354 Send it
+Received: from ph10 by myhost.test.ex with local (Exim x.yz)
+ id 10HmbF-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbF-0005vi-00@???>
+From: Philip Hazel <ph10@???>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+This is a test message.
+.
+250 OK
+250 OK
+250 OK
+QUIT
+250 OK
+End of script
Index: 454
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/454,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 454 8 Oct 2004 14:50:13 -0000 1.1
+++ 454 2 Aug 2005 11:22:24 -0000 1.2
@@ -69,6 +69,7 @@
batch_id =
batch_max = 20
command = /x/y
+no_ignore_quota
socket =
timeout = 5m
no_body_only
@@ -98,5 +99,6 @@
batch_id =
batch_max = 10
command = /x/y
+no_ignore_quota
socket =
timeout = 5m
