ph10 2006/07/07 14:36:34 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src log.c
Log:
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.
Revision Changes Path
1.370 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.10 +9 -4 exim/exim-src/src/log.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.369
retrieving revision 1.370
diff -u -r1.369 -r1.370
--- ChangeLog 6 Jul 2006 14:28:03 -0000 1.369
+++ ChangeLog 7 Jul 2006 13:36:33 -0000 1.370
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.369 2006/07/06 14:28:03 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.370 2006/07/07 13:36:33 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -77,6 +77,11 @@
PH/12 Applied patch from Magnus Holmgren to include the "h" tag in Domain Keys
signatures.
+
+PH/13 If write_rejectlog was set false when logging was sent to syslog with
+ syslog_duplication set false, log lines that would normally be written
+ both the the main log and to the reject log were not written to syslog at
+ all.
Exim version 4.62
Index: log.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/log.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- log.c 13 Feb 2006 11:28:56 -0000 1.9
+++ log.c 7 Jul 2006 13:36:34 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/log.c,v 1.9 2006/02/13 11:28:56 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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 @@
}
}
-/* 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;
