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
Testsuite: avoid total fail on DISABLE_EVENT build
[exim.git]
/
src
/
src
/
transports
/
lmtp.c
diff --git
a/src/src/transports/lmtp.c
b/src/src/transports/lmtp.c
index f751771c14a18441b30d5cb5b044c57947a300c7..7f82ef708587b4f01343def4f9c960d404c72312 100644
(file)
--- a/
src/src/transports/lmtp.c
+++ b/
src/src/transports/lmtp.c
@@
-2,12
+2,15
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) The Exim Maintainers 2020 - 202
2
*/
+/* Copyright (c) The Exim Maintainers 2020 - 202
4
*/
/* 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"
+#ifdef TRANSPORT_LMTP /* Remainder of file */
+
#include "lmtp.h"
#define PENDING_OK 256
#include "lmtp.h"
#define PENDING_OK 256
@@
-240,7
+243,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;
@@
-489,8
+492,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, FALSE
,
- 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. */
@@
-806,4
+809,5
@@
MINUS_N:
}
#endif /*!MACRO_PREDEF*/
}
#endif /*!MACRO_PREDEF*/
+#endif /*TRANSPORT_LMTP*/
/* End of transport/lmtp.c */
/* End of transport/lmtp.c */