INN commit: trunk (4 files)

[INN Commit]

    Date: Monday, September 18, 2017 @ 12:04:43
  Author: iulius
Revision: 10172

Document when Injection-Date: header field is not added by nnrpd (case of multiple injection)

Thanks to Thomas Hochstein for prompting to document that
behaviour.

Modified:
  trunk/CONTRIBUTORS
  trunk/doc/pod/inn.conf.pod
  trunk/doc/pod/readers.conf.pod
  trunk/nnrpd/post.c

--------------------------+
 CONTRIBUTORS             |    2 +-
 doc/pod/inn.conf.pod     |   11 +++++++++--
 doc/pod/readers.conf.pod |    8 +++++---
 nnrpd/post.c             |    7 ++++---
 4 files changed, 19 insertions(+), 9 deletions(-)

Modified: CONTRIBUTORS
===================================================================
--- CONTRIBUTORS	2017-07-22 14:01:37 UTC (rev 10171)
+++ CONTRIBUTORS	2017-09-18 19:04:43 UTC (rev 10172)
@@ -277,4 +277,4 @@
 Dennis Preiser, Paolo Amoroso, Dennis Davis, River Tarnell, Jochen Schmitt,
 Tim Fardell, Remco Rijnders, David Binderman, Tony Evans, Christian Garbs,
 Jesse Rehmer, Colin Watson, Lauri Tirkkonen, Christian Mock, Marcus Jodorf,
-Richard Kettlewell, Yuriy M. Kaminskiy, Bill Parker
+Richard Kettlewell, Yuriy M. Kaminskiy, Bill Parker, Thomas Hochstein

Modified: doc/pod/inn.conf.pod
===================================================================
--- doc/pod/inn.conf.pod	2017-07-22 14:01:37 UTC (rev 10171)
+++ doc/pod/inn.conf.pod	2017-09-18 19:04:43 UTC (rev 10172)
@@ -861,9 +861,16 @@
 
 =item I<addinjectiondate>
 
-Whether to add an Injection-Date: header to all local posts.  This is a
-boolean value and the default is true.
+Whether to add an Injection-Date: header field to all local posts.
+This is a boolean value and the default is true.
 
+Note that no Injection-Date: header fields will be added to local posts
+already containing both a Message-ID: header field and a Date: header
+field.  This is done in conformance with standards, to help minimize
+the possibility of a loop in e-mail gatewaying and ensure that a newly
+injected article is not treated as a new, separate article in case of
+multiple injection of the same article to different injecting agents.
+
 =item I<addinjectionpostingaccount>
 
 Whether to add a posting-account attribute to the Injection-Info: header

Modified: doc/pod/readers.conf.pod
===================================================================
--- doc/pod/readers.conf.pod	2017-07-22 14:01:37 UTC (rev 10171)
+++ doc/pod/readers.conf.pod	2017-09-18 19:04:43 UTC (rev 10172)
@@ -512,9 +512,11 @@
 
 If a Date: or an Injection-Date: header field is not included in a
 posted article, nnrpd(8) normally adds these header fields in UTC.
-If this is set to true, the Date: header field will be formatted in
-local time instead.  (The Injection-Date: header field will remain in
-UTC, though.)  This is a boolean value and the default is false.
+If this is set to true, the Date: header field will be formatted in local
+time instead.  (The Injection-Date: header field is added according to
+the behaviour of the I<addinjectiondate> parameter in F<inn.conf>, and
+will remain in UTC, though.)  This is a boolean value and the default
+is false.
 
 This parameter permits to handle a relatively unusual corner case.
 It is mostly a tool for people who I<want> to disclose their local time

Modified: nnrpd/post.c
===================================================================
--- nnrpd/post.c	2017-07-22 14:01:37 UTC (rev 10171)
+++ nnrpd/post.c	2017-09-18 19:04:43 UTC (rev 10172)
@@ -387,10 +387,11 @@
         }
     }
 
-    /* Set the Injection-Date: header. */
-    /* Start with this header because it MUST NOT be added in case
+    /* Set the Injection-Date: header field. */
+    /* Start with this header field because it MUST NOT be added in case
      * the article already contains both Message-ID: and Date:
-     * header fields (possibility of multiple injections). */
+     * header fields (possibility of multiple injection, see Sections 3.4.2
+     * and 3.5 of RFC 5537). */
     if (HDR(HDR__INJECTION_DATE) == NULL) {
         /* If moderation is needed, do not add an Injection-Date: header field. */
         if (!needmoderation && PERMaccessconf->addinjectiondate) {