-/* $Cambridge: exim/src/src/transports/lmtp.c,v 1.1 2004/10/07 13:10:02 ph10 Exp $ */
+/* $Cambridge: exim/src/src/transports/lmtp.c,v 1.6 2005/08/02 11:22:24 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 2004 */
+/* Copyright (c) University of Cambridge 1995 - 2005 */
/* See the file NOTICE for conditions of use and distribution. */
(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,
NULL, /* cmd */
NULL, /* skt */
5*60, /* timeout */
- 0 /* options */
+ 0, /* options */
+ FALSE /* ignore_quota */
};
if (*errno_value == ERRNO_FILTER_FAIL)
{
- *message = string_sprintf("transport filter process failed (%d)", more_errno);
+ *message = string_sprintf("transport filter process failed (%d)%s",
+ more_errno,
+ (more_errno == EX_EXECFAILED)? ": unable to execute command" : "");
return FALSE;
}
BOOL send_data;
BOOL yield = FALSE;
address_item *addr;
+uschar *igquotstr = US"";
uschar *sockname = NULL;
uschar **argv;
uschar buffer[256];
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))
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))
{
(void)child_close(pid, timeout);
-if (fd_in >= 0) (void) close(fd_in);
-if (fd_out >= 0) (void) fclose(out);
+if (fd_in >= 0) (void)close(fd_in);
+if (fd_out >= 0) (void)fclose(out);
DEBUG(D_transport)
debug_printf("%s transport yields %d\n", tblock->name, yield);