summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-07-07 13:36:33 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-07-07 13:36:33 +0000
commita7d7aa5833d855cf85d3b77065e49a0fdda57c22 (patch)
treeef86c9558233eb4ff40b8b2c5be3ccfa3ae98d11 /src
parent75fa1910b6e49a953492766459e6b052f9b6b88e (diff)
Log lines flagged for both main and reject logs were not written to
syslog at all when both write_rejectlog and syslog_duplication were false.
Diffstat (limited to 'src')
-rw-r--r--src/src/log.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/src/log.c b/src/src/log.c
index d5e89f2cf..23583ee6b 100644
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/log.c,v 1.9 2006/02/13 11:28:56 ph10 Exp $ */
+/* $Cambridge: exim/src/src/log.c,v 1.10 2006/07/07 13:36:34 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -724,6 +724,10 @@ if (disable_logging)
return;
}
+/* Handle disabled reject log */
+
+if (!write_rejectlog) flags &= ~LOG_REJECT;
+
/* Create the main message in the log buffer, including the message
id except for the process log and when called by a utility. */
@@ -858,11 +862,12 @@ if ((flags & LOG_MAIN) != 0 &&
}
}
-/* Handle the log for rejected messages. This can be globally disabled. If
-there are any header lines (i.e. if the rejection is happening after the DATA
-phase), log the recipients and the headers. */
+/* Handle the log for rejected messages. This can be globally disabled, in
+which case the flags are altered above. If there are any header lines (i.e. if
+the rejection is happening after the DATA phase), log the recipients and the
+headers. */
-if (write_rejectlog && (flags & LOG_REJECT) != 0)
+if ((flags & LOG_REJECT) != 0)
{
header_line *h;