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
Fix debug_print_socket()
[exim.git]
/
src
/
src
/
filter.c
diff --git
a/src/src/filter.c
b/src/src/filter.c
index c5081698f33533e205eead4f27a364b87b9d977a..59c08f882ea224bb8d125fc30bbfc7860c3c254b 100644
(file)
--- a/
src/src/filter.c
+++ b/
src/src/filter.c
@@
-3,6
+3,7
@@
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
*************************************************/
/* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-1951,7
+1952,7
@@
while (commands)
(long int)geteuid());
if (log_fd < 0)
{
(long int)geteuid());
if (log_fd < 0)
{
- if (
log_filename == NULL
)
+ if (
!log_filename
)
{
*error_pointer = US"attempt to obey \"logwrite\" command "
"without a previous \"logfile\"";
{
*error_pointer = US"attempt to obey \"logwrite\" command "
"without a previous \"logfile\"";
@@
-1960,7
+1961,7
@@
while (commands)
log_fd = Uopen(log_filename, O_CREAT|O_APPEND|O_WRONLY, log_mode);
if (log_fd < 0)
{
log_fd = Uopen(log_filename, O_CREAT|O_APPEND|O_WRONLY, log_mode);
if (log_fd < 0)
{
- *error_pointer = string_open_failed(
errno,
"filter log file \"%s\"",
+ *error_pointer = string_open_failed("filter log file \"%s\"",
log_filename);
return FF_ERROR;
}
log_filename);
return FF_ERROR;
}
@@
-1974,9
+1975,8
@@
while (commands)
}
}
else
}
}
else
- {
- DEBUG(D_filter) debug_printf_indent("skipping logwrite (verifying or testing)\n");
- }
+ DEBUG(D_filter)
+ debug_printf_indent("skipping logwrite (verifying or testing)\n");
break;
/* Header addition and removal is available only in the system filter. The
break;
/* Header addition and removal is available only in the system filter. The
@@
-2430,9
+2430,9
@@
suffixed version of the local part in the tests. */
if (deliver_localpart_prefix || deliver_localpart_suffix)
{
psself = string_sprintf("%s%s%s@%s",
if (deliver_localpart_prefix || deliver_localpart_suffix)
{
psself = string_sprintf("%s%s%s@%s",
-
(deliver_localpart_prefix == NULL)? US"" : deliver_localpart_prefix
,
+
deliver_localpart_prefix ? deliver_localpart_prefix : US""
,
deliver_localpart,
deliver_localpart,
-
(deliver_localpart_suffix == NULL)? US"" : deliver_localpart_suffix
,
+
deliver_localpart_suffix ? deliver_localpart_suffix : US""
,
deliver_domain);
psself_from = rewrite_one(psself, rewrite_from, NULL, FALSE, US"",
global_rewrite_rules);
deliver_domain);
psself_from = rewrite_one(psself, rewrite_from, NULL, FALSE, US"",
global_rewrite_rules);