git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright updates:
[exim.git]
/
src
/
src
/
transports
/
lmtp.c
diff --git
a/src/src/transports/lmtp.c
b/src/src/transports/lmtp.c
index 517a13494f619f9fbd36618b0cfd7132de6355d6..f3f9088363141d18142b546776a863a4834a272a 100644
(file)
--- a/
src/src/transports/lmtp.c
+++ b/
src/src/transports/lmtp.c
@@
-2,8
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2023 */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
/* Copyright (c) University of Cambridge 1995 - 2018 */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "../exim.h"
#include "../exim.h"
@@
-239,7
+241,7
@@
if (!string_vformat(&gs, SVFMT_TAINT_NOCHK, CS format, ap))
return FALSE;
}
va_end(ap);
return FALSE;
}
va_end(ap);
-DEBUG(D_transport|D_v) debug_printf(" LMTP>> %
s", string_from_gstring(&gs)
);
+DEBUG(D_transport|D_v) debug_printf(" LMTP>> %
Y", &gs
);
rc = write(fd, gs.s, gs.ptr);
gs.ptr -= 2; string_from_gstring(&gs); /* remove \r\n for debug and error message */
if (rc > 0) return TRUE;
rc = write(fd, gs.s, gs.ptr);
gs.ptr -= 2; string_from_gstring(&gs); /* remove \r\n for debug and error message */
if (rc > 0) return TRUE;
@@
-488,8
+490,8
@@
if (ob->cmd)
{
DEBUG(D_transport) debug_printf("using command %s\n", ob->cmd);
sprintf(CS buffer, "%.50s transport", tblock->name);
{
DEBUG(D_transport) debug_printf("using command %s\n", ob->cmd);
sprintf(CS buffer, "%.50s transport", tblock->name);
- if (!transport_set_up_command(&argv, ob->cmd, T
RUE, PANIC, addrlist, buffer
,
- NULL))
+ if (!transport_set_up_command(&argv, ob->cmd, T
SUC_EXPAND_ARGS, PANIC
,
+
addrlist, buffer,
NULL))
return FALSE;
/* If the -N option is set, can't do any more. Presume all has gone well. */
return FALSE;
/* If the -N option is set, can't do any more. Presume all has gone well. */
@@
-557,23
+559,23
@@
allows for message+recipient checks after the message has been received. */
/* First thing is to wait for an initial greeting. */
Ustrcpy(big_buffer, US"initial connection");
/* First thing is to wait for an initial greeting. */
Ustrcpy(big_buffer, US"initial connection");
-if (!lmtp_read_response(out, buffer, sizeof(buffer), '2',
-
timeout))
goto RESPONSE_FAILED;
+if (!lmtp_read_response(out, buffer, sizeof(buffer), '2',
timeout))
+ goto RESPONSE_FAILED;
/* Next, we send a LHLO command, and expect a positive response */
/* Next, we send a LHLO command, and expect a positive response */
-if (!lmtp_write_command(fd_in, "%s %s\r\n", "LHLO",
-
primary_hostname))
goto WRITE_FAILED;
+if (!lmtp_write_command(fd_in, "%s %s\r\n", "LHLO",
primary_hostname))
+ goto WRITE_FAILED;
-if (!lmtp_read_response(out, buffer, sizeof(buffer), '2',
-
timeout))
goto RESPONSE_FAILED;
+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)
/* 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"";
+ igquotstr =
regex_match(regex_IGNOREQUOTA, buffer, -1, NULL)
+ ? US" IGNOREQUOTA" : US"";
/* Now the envelope sender */
/* Now the envelope sender */