INN commit: trunk (16 files)

INN Commit rra at isc.org
Thu Dec 24 12:08:00 UTC 2009


    Date: Thursday, December 24, 2009 @ 04:08:00
  Author: iulius
Revision: 8857

Use of Injection-Info: headers.

* nnrpd no longer generates NNTP-Posting-Date:, NNTP-Posting-Host:,
X-Trace: and X-Complaints-To: headers.  Instead, Injection-Date:
and Injection-Info: are used.

* Rename addnntppostinghost and addnntppostingdate parameters
in inn.conf to respectively addinjectiondate and addinjectionpostinghost.
innupgrade deals with that only for inn.conf; a manual change will
be needed for readers.conf, if these parameters are overriden in this
file.

* Update the test suite, documentation and the FAQ.

Modified:
  trunk/doc/FAQ
  trunk/doc/pod/hook-perl.pod
  trunk/doc/pod/inn.conf.pod
  trunk/doc/pod/innupgrade.pod
  trunk/doc/pod/install.pod
  trunk/doc/pod/readers.conf.pod
  trunk/include/inn/innconf.h
  trunk/lib/innconf.c
  trunk/nnrpd/nnrpd.h
  trunk/nnrpd/perm.c
  trunk/nnrpd/post.c
  trunk/nnrpd/post.h
  trunk/samples/inn.conf.in
  trunk/scripts/innupgrade.in
  trunk/tests/data/upgrade/inn.conf
  trunk/tests/data/upgrade/inn.conf.ok

--------------------------------+
 doc/FAQ                        |   18 +++----
 doc/pod/hook-perl.pod          |    2 
 doc/pod/inn.conf.pod           |   41 +++++++++--------
 doc/pod/innupgrade.pod         |    6 +-
 doc/pod/install.pod            |    9 ++-
 doc/pod/readers.conf.pod       |    4 -
 include/inn/innconf.h          |    6 +-
 lib/innconf.c                  |    4 -
 nnrpd/nnrpd.h                  |    4 -
 nnrpd/perm.c                   |   26 ++++++-----
 nnrpd/post.c                   |   91 +++++++++++++++++++++------------------
 nnrpd/post.h                   |    4 -
 samples/inn.conf.in            |    4 -
 scripts/innupgrade.in          |    8 +++
 tests/data/upgrade/inn.conf    |    2 
 tests/data/upgrade/inn.conf.ok |    2 
 16 files changed, 127 insertions(+), 104 deletions(-)

Modified: doc/FAQ
===================================================================
--- doc/FAQ	2009-12-24 12:06:25 UTC (rev 8856)
+++ doc/FAQ	2009-12-24 12:08:00 UTC (rev 8857)
@@ -86,7 +86,7 @@
     6.8.  Generate MRTG graphs for INN
     6.9.  Hide the junk and control groups from users
     6.10. Modify the body of posts made through my server
-    6.11. Hide the X-Trace header
+    6.11. Hide the Injection-Info header
     6.12. Run innd and nnrpd on separate ports
     6.13. Back up and restore an INN installation
 
@@ -1367,23 +1367,23 @@
 
 ------------------------------
 
-Subject: 6.11. Hide the X-Trace header
+Subject: 6.11. Hide the Injection-Info header
 
-There is no built-in support for suppressing generation of the X-Trace
-header.  You can, however, remove it from inside a Perl posting filter.
-Try using a posting filter like this:
+There is no built-in support for suppressing generation of the
+Injection-Info header.  You can, however, remove it from inside a Perl
+posting filter.  Try using a posting filter like this:
 
     sub filter_post {
         $modify_headers = 1;
-        delete $hdr{'X-Trace'};
+        delete $hdr{'Injection-Info'};
         return '';
     }
 
 Note that you have to set $modify_headers to make changes to the article
 header effective in the actual posted article.  Instead of removing the
-header, you can also alter it if you modify $hdr{'X-Trace'}.  If you only
-want to alter the host name used in X-Trace, see the virtualhost: and
-domain: parameters in readers.conf.
+header, you can also alter it if you modify $hdr{'Injection-Info'}.  If you
+only want to alter the host name used in Injection-Info, see the
+virtualhost: and domain: parameters in readers.conf.
 
 ------------------------------
 

Modified: doc/pod/hook-perl.pod
===================================================================
--- doc/pod/hook-perl.pod	2009-12-24 12:06:25 UTC (rev 8856)
+++ doc/pod/hook-perl.pod	2009-12-24 12:08:00 UTC (rev 8857)
@@ -537,7 +537,7 @@
      sub access {
         %return_hash = (
            "max_rate" => "10000",
-	   "addnntppostinghost" => "true",
+	   "addinjectionpostinghost" => "true",
      #     ...
         );
         if( defined $attributes{username} &&

Modified: doc/pod/inn.conf.pod
===================================================================
--- doc/pod/inn.conf.pod	2009-12-24 12:06:25 UTC (rev 8856)
+++ doc/pod/inn.conf.pod	2009-12-24 12:08:00 UTC (rev 8857)
@@ -414,10 +414,10 @@
 names.  Overview data for these additional headers will be generated
 for each new article at the time of arrival.  For instance, if you specify:
 
-    extraoverviewadvertised: [ Path NNTP-Hosting-Host ]
+    extraoverviewadvertised: [ Path Injection-Info ]
 
 it implies that B<nnrpd> will advertise C<Path:full> and
-C<NNTP-Hosting-Host:full> as the ninth and tenth fields in response
+C<Injection-Info:full> as the ninth and tenth fields in response
 to LIST OVERVIEW.FMT and that these two headers will be stored in the
 overview database for each new article.
 
@@ -442,7 +442,7 @@
 If for instance you want to store the content of the To: header in addition
 to the fields already stored above, you should use:
 
-    extraoverviewadvertised: [ Path NNTP-Hosting-Host ]
+    extraoverviewadvertised: [ Path Injection-Info ]
     extraoverviewhidden:     [ To ]
 
 This way, C<To:full> will not be advertised by B<nnrpd> but will be stored
@@ -453,7 +453,7 @@
 to expiration can be unpredictable with CNFS and you then have to use
 C<cnfsstat -a> for checking on when buffers have rolled over), you should put:
 
-    extraoverviewadvertised: [ Path NNTP-Hosting-Host To ]
+    extraoverviewadvertised: [ Path Injection-Info To ]
     extraoverviewhidden:     [ ]
 
 The C<To> value must be added at the end of the list because
@@ -463,7 +463,7 @@
 OVERVIEW.FMT command (C<full> indicates that the header appears
 followed by its value).
 
-Now suppose you want to remove the content of the NNTP-Hosting-Host:
+Now suppose you want to remove the content of the Injection-Info:
 header from the overview.  As order matters, the overview database will
 no longer be consistent for the To: header.  Therefore, you need to specify:
 
@@ -818,19 +818,20 @@
 
 =over 4
 
-=item I<addnntppostingdate>
+=item I<addinjectiondate>
 
-Whether to add an NNTP-Posting-Date: header to all local posts.  This is a
+Whether to add an Injection-Date: header to all local posts.  This is a
 boolean value and the default is true.
 
-=item I<addnntppostinghost>
+=item I<addinjectionpostinghost>
 
-Whether to add an NNTP-Posting-Host: header to all local posts giving the
-FQDN or IP address of the system from which the post was received.  This
-is a boolean value and the default is true.  Note that INN either does not
-add this header or adds the name or IP address of the client.  There is no
-intrinsic support for obfuscating the name of the client.  That has to be
-done with a user-written Perl filter, if desired.
+Whether to add a posting-host attribute to the Injection-Info: header to
+all local posts giving the FQDN (when known) and IP address of the system
+from which the post was received.  This is a boolean value and the default
+is true.  Note that INN either does not add this attribute or adds the name
+(when known) and IP address of the client.  There is no intrinsic support for
+obfuscating the name of the client.  That has to be done with a user-written
+Perl filter, if desired.
 
 =item I<checkincludedtext>
 
@@ -841,11 +842,11 @@
 
 =item I<complaints>
 
-The value of the X-Complaints-To: header added to all local posts.  The
-default is the newsmaster's e-mail address.  (If the newsmaster, selected
-at configure time and defaulting to C<usenet>, doesn't contain C<@>, the
-address will consist of the newsmaster, a C<@>, and the value of
-I<fromhost>.)
+The value of the mail-complaints-to attribute of the Injection-Info: header
+added to all local posts.  The default is the newsmaster's e-mail address.
+(If the newsmaster, selected at configure time and defaulting to C<usenet>,
+doesn't contain C<@>, the address will consist of the newsmaster, a C<@>,
+and the value of I<fromhost>.)
 
 =item I<fromhost>
 
@@ -885,7 +886,7 @@
 this parameter is set, a Sender: header will be added to local posts
 containing the identity assigned by F<readers.conf>.  If the assigned
 identity does not include an C<@>, the reader's hostname is used.  If this
-parameter is set but no identity is be assigned, the Sender: header will
+parameter is set but no identity is assigned, the Sender: header will
 be removed from all posts even if the poster includes one.  This is a
 boolean value and the default is false.
 

Modified: doc/pod/innupgrade.pod
===================================================================
--- doc/pod/innupgrade.pod	2009-12-24 12:06:25 UTC (rev 8856)
+++ doc/pod/innupgrade.pod	2009-12-24 12:08:00 UTC (rev 8857)
@@ -40,8 +40,10 @@
 =item *
 
 Add the I<hismethod> parameter if not found (introduced in S<INN 2.4>,
-with the default value C<hisv6>) and rename I<nntpactsync> to
-I<incominglogfrequency> (since S<INN 2.5>).
+with the default value C<hisv6>).  Rename I<nntpactsync> to
+I<incominglogfrequency> (since S<INN 2.5>).  Rename I<addnntppostingdate>
+and I<addnntppostinghost> to respectively I<addinjectiondate> and
+I<addinjectionpostinghost> (since S<INN 2.6>).
 
 =item *
 

Modified: doc/pod/install.pod
===================================================================
--- doc/pod/install.pod	2009-12-24 12:06:25 UTC (rev 8856)
+++ doc/pod/install.pod	2009-12-24 12:08:00 UTC (rev 8857)
@@ -727,10 +727,11 @@
 
 =item complaints
 
-Used to set the value of the X-Complaints-To: header, which is added to
-all articles posted locally.  The usual value would be something like
-C<abuse at example.com> or C<postmaster at example.com>.  If not specified, the
-newsmaster e-mail address will be used.
+Used to set the value of the mail-complaints-to attribute of
+the Injection-Info: header, which is added to all articles posted
+locally.  The usual value would be something like C<abuse at example.com>
+or C<postmaster at example.com>.  If not specified, the newsmaster e-mail
+address will be used.
 
 =item hiscachesize
 

Modified: doc/pod/readers.conf.pod
===================================================================
--- doc/pod/readers.conf.pod	2009-12-24 12:06:25 UTC (rev 8856)
+++ doc/pod/readers.conf.pod	2009-12-24 12:08:00 UTC (rev 8857)
@@ -501,7 +501,7 @@
 than is set in F<inn.conf>.  All articles displayed to clients will then have
 their Path: and Xref: headers altered to appear to be from the server
 named in pathhost: or domain: (whichever is set), and posted articles will
-use that server name in the Path:, Message-ID:, and X-Trace: headers.
+use that server name in the Path:, Message-ID:, and Injection-Info: headers.
 
 Note that setting this parameter requires the server modify all posts
 before presenting them to the client and therefore may decrease
@@ -513,7 +513,7 @@
 and override the global setting in F<inn.conf>.  See inn.conf(5) for the
 descriptions of these parameters:
 
-    addnntppostingdate, addnntppostinghost, backoff_auth, backoff_db,
+    addinjectiondate, addinjectionpostinghost, backoff_auth, backoff_db,
     backoff_k, backoff_postfast, backoff_postslow, backoff_trigger,
     checkincludedtext, clienttimeout, complaints, domain,
     fromhost, localmaxartsize, moderatormailer, nnrpdauthsender,

Modified: include/inn/innconf.h
===================================================================
--- include/inn/innconf.h	2009-12-24 12:06:25 UTC (rev 8856)
+++ include/inn/innconf.h	2009-12-24 12:08:00 UTC (rev 8857)
@@ -99,10 +99,10 @@
     unsigned long keymaxwords;  /* Max count of interesting words */
 
     /* Posting */
-    bool addnntppostingdate;    /* Add NNTP-Posting-Date: to posts */
-    bool addnntppostinghost;    /* Add NNTP-Posting-Host: to posts */
+    bool addinjectiondate;      /* Add Injection-Date: to posts */
+    bool addinjectionpostinghost; /* Add posting-host attribute to Injection-Info: to posts */
     bool checkincludedtext;     /* Reject if too much included text */
-    char *complaints;           /* Address for X-Complaints-To: */
+    char *complaints;           /* Address for mail-complaints-to attribute to Injection-Info: */
     char *fromhost;             /* Host for the From: line */
     unsigned long localmaxartsize; /* Max article size of local postings */
     char *moderatormailer;      /* Default host to mail moderated articles */

Modified: lib/innconf.c
===================================================================
--- lib/innconf.c	2009-12-24 12:06:25 UTC (rev 8856)
+++ lib/innconf.c	2009-12-24 12:08:00 UTC (rev 8857)
@@ -191,8 +191,8 @@
     { K(xrefslave),               BOOL   (false) },
 
     /* The following settings are specific to nnrpd. */
-    { K(addnntppostingdate),      BOOL    (true) },
-    { K(addnntppostinghost),      BOOL    (true) },
+    { K(addinjectiondate),        BOOL    (true) },
+    { K(addinjectionpostinghost), BOOL    (true) },
     { K(allownewnews),            BOOL    (true) },
     { K(backoffauth),             BOOL   (false) },
     { K(backoffdb),               STRING  (NULL) },

Modified: nnrpd/nnrpd.h
===================================================================
--- nnrpd/nnrpd.h	2009-12-24 12:06:25 UTC (rev 8856)
+++ nnrpd/nnrpd.h	2009-12-24 12:08:00 UTC (rev 8857)
@@ -65,8 +65,8 @@
     unsigned long localmaxartsize;
     int readertrack;
     int strippostcc;
-    int addnntppostinghost;
-    int addnntppostingdate;
+    int addinjectiondate;
+    int addinjectionpostinghost;
     char *nnrpdposthost;
     unsigned long nnrpdpostport;
     int nnrpdoverstats;

Modified: nnrpd/perm.c
===================================================================
--- nnrpd/perm.c	2009-12-24 12:06:25 UTC (rev 8856)
+++ nnrpd/perm.c	2009-12-24 12:08:00 UTC (rev 8857)
@@ -137,8 +137,8 @@
 #define PERMlocalmaxartsize	35
 #define PERMreadertrack		36
 #define PERMstrippostcc		37
-#define PERMaddnntppostinghost	38
-#define PERMaddnntppostingdate	39
+#define PERMaddinjectiondate	38
+#define PERMaddinjectionpostinghost	39
 #define PERMnnrpdposthost	40
 #define PERMnnrpdpostport	41
 #define PERMnnrpdoverstats	42
@@ -226,8 +226,8 @@
     { PERMlocalmaxartsize,      (char *) "localmaxartsize:"     },
     { PERMreadertrack,          (char *) "readertrack:"         },
     { PERMstrippostcc,          (char *) "strippostcc:"         },
-    { PERMaddnntppostinghost,   (char *) "addnntppostinghost:"  },
-    { PERMaddnntppostingdate,   (char *) "addnntppostingdate:"  },
+    { PERMaddinjectiondate,     (char *) "addinjectiondate:"    },
+    { PERMaddinjectionpostinghost, (char *) "addinjectionpostinghost:" },
     { PERMnnrpdposthost,        (char *) "nnrpdposthost:"       },
     { PERMnnrpdpostport,        (char *) "nnrpdpostport:"       },
     { PERMnnrpdoverstats,       (char *) "nnrpdoverstats:"      },
@@ -487,8 +487,8 @@
     curaccess->localmaxartsize = innconf->localmaxartsize;
     curaccess->readertrack = innconf->readertrack;
     curaccess->strippostcc = innconf->strippostcc;
-    curaccess->addnntppostinghost = innconf->addnntppostinghost;
-    curaccess->addnntppostingdate = innconf->addnntppostingdate;
+    curaccess->addinjectiondate = innconf->addinjectiondate;
+    curaccess->addinjectionpostinghost = innconf->addinjectionpostinghost;
     curaccess->nnrpdposthost = innconf->nnrpdposthost;
     curaccess->nnrpdpostport = innconf->nnrpdpostport;
     curaccess->nnrpdoverstats = innconf->nnrpdoverstats;
@@ -969,12 +969,14 @@
 	if (boolval != -1) curaccess->strippostcc = boolval;
 	SET_CONFIG(oldtype);
 	break;
-      case PERMaddnntppostinghost:
-	if (boolval != -1) curaccess->addnntppostinghost = boolval;
+      case PERMaddinjectiondate:
+	if (boolval != -1)
+            curaccess->addinjectiondate = boolval;
 	SET_CONFIG(oldtype);
 	break;
-      case PERMaddnntppostingdate:
-	if (boolval != -1) curaccess->addnntppostingdate = boolval;
+      case PERMaddinjectionpostinghost:
+	if (boolval != -1)
+            curaccess->addinjectionpostinghost = boolval;
 	SET_CONFIG(oldtype);
 	break;
       case PERMnnrpdposthost:
@@ -1281,8 +1283,8 @@
 	      case PERMlocalmaxartsize:
 	      case PERMreadertrack:
 	      case PERMstrippostcc:
-	      case PERMaddnntppostinghost:
-	      case PERMaddnntppostingdate:
+	      case PERMaddinjectiondate:
+	      case PERMaddinjectionpostinghost:
 	      case PERMnnrpdposthost:
 	      case PERMnnrpdpostport:
 	      case PERMnnrpdoverstats:

Modified: nnrpd/post.c
===================================================================
--- nnrpd/post.c	2009-12-24 12:06:25 UTC (rev 8856)
+++ nnrpd/post.c	2009-12-24 12:08:00 UTC (rev 8857)
@@ -121,7 +121,7 @@
     if (q < p || q > p + i)
 	q = p;
 
-    /* Simple case of just want the begining? */
+    /* Simple case of just want the beginning? */
     if (q == NULL || (size_t)(q - p) < sizeof(buff) - 4) {
 	strlcpy(buff, p, sizeof(buff) - 3);
         strlcat(buff, "...", sizeof(buff));
@@ -316,18 +316,18 @@
 static const char *
 ProcessHeaders(char *idbuff, bool ihave)
 {
-    static char		MONTHS[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
     static char		datebuff[40];
     static char		localdatebuff[40];
     static char		orgbuff[SMBUF];
-    static char		tracebuff[SMBUF];
+    static char         pathidentitybuff[SMBUF];
     static char 	complaintsbuff[SMBUF];
+    static char         postinghostbuff[SMBUF];
     static char		sendbuff[SMBUF];
+    static char         injectioninfobuff[SMBUF];
     static char		*newpath = NULL;
     HEADER		*hp;
     char		*p;
     time_t		t, now;
-    struct tm		*gmt;
     const char          *error;
     pid_t               pid;
     bool		addvirtual = false;
@@ -366,7 +366,7 @@
 	}
     }
 
-    /* Set the Date: header.  datebuff is used later for NNTP-Posting-Date:,
+    /* Set the Date: header.  datebuff is used later for Injection-Date:,
      * so we have to set it, and it has to be the UTC date. */
     if (!makedate(-1, false, datebuff, sizeof(datebuff)))
         return "Can't generate Date: header";
@@ -473,17 +473,11 @@
 
     /* Supersedes: is left alone. */
 
-    /* Set the NNTP-Posting-Host: header. */
-    if (!ihave && PERMaccessconf->addnntppostinghost) 
-        HDR_SET(HDR__NNTPPOSTINGHOST, Client.host);
-    
-    /* Set the NNTP-Posting-Date: header. */
-    if (!ihave && PERMaccessconf->addnntppostingdate)
-        HDR_SET(HDR__NNTPPOSTINGDATE, datebuff);
-
     /* Set the Injection-Date: header. */
     if (HDR(HDR__INJECTION_DATE) == NULL) {
-        HDR_SET(HDR__INJECTION_DATE, datebuff);
+        if (PERMaccessconf->addinjectiondate) {
+            HDR_SET(HDR__INJECTION_DATE, datebuff);
+        }
     } else {
         t = parsedate_rfc2822_lax(HDR(HDR__INJECTION_DATE));
         if (t == (time_t) -1)
@@ -492,37 +486,52 @@
             return "Article injected in the future";
     }
 
-    /* Set the X-Trace: header. */
-    pid = (long) getpid() ;
-    if ((gmt = gmtime(&now)) == NULL)
-	return "Can't get the time";
-    if (VirtualPathlen > 0)
-	p = PERMaccessconf->domain;
-    else
-	if ((p = GetFQDN(PERMaccessconf->domain)) == NULL)
-	    p = (char *) "unknown";
-    snprintf(tracebuff, sizeof(tracebuff),
-             "%s %ld %ld %s (%d %3.3s %d %02d:%02d:%02d GMT)",
-             p, (long) now, (long) pid, Client.ip,
-             gmt->tm_mday, &MONTHS[3 * gmt->tm_mon], 1900 + gmt->tm_year,
-             gmt->tm_hour, gmt->tm_min, gmt->tm_sec);
-    HDR_SET(HDR__XTRACE, tracebuff);
+    /* Set the Injection-Info: header. */
+    /* Set the path identity. */
+    if (VirtualPathlen > 0) {
+        p = PERMaccessconf->domain;
+    } else {
+        if ((p = GetFQDN(PERMaccessconf->domain)) == NULL) {
+            p = (char *) "unknown";
+        }
+    }
+    snprintf(pathidentitybuff, sizeof(pathidentitybuff), "%s", p);
 
-    /* Set the X-Complaints-To: header. */
-    if ((p = PERMaccessconf->complaints) != NULL)
-	snprintf (complaintsbuff, sizeof(complaintsbuff), "%s", p);
-    else {
-	static const char newsmaster[] = NEWSMASTER;
+    /* Set the posting-host identity. */
+    if (strcmp(Client.host, Client.ip) == 0) {
+        snprintf(postinghostbuff, sizeof(postinghostbuff),
+                 "; posting-host=\"%s\"", Client.ip);
+    } else {
+        snprintf(postinghostbuff, sizeof(postinghostbuff),
+                 "; posting-host=\"%s:%s\"", Client.host, Client.ip);
+    }
 
-	if ((p = PERMaccessconf->fromhost) != NULL && strchr(newsmaster, '@') == NULL)
-	    snprintf (complaintsbuff, sizeof(complaintsbuff), "%s@%s",
-                      newsmaster, p);
-	else
-	    snprintf (complaintsbuff, sizeof(complaintsbuff), "%s",
-                      newsmaster);
+    /* Set the logging-data attribute. */
+    pid = getpid();
+
+    /* Set the mail-complaints-to attribute. */
+    if ((p = PERMaccessconf->complaints) != NULL) {
+        snprintf(complaintsbuff, sizeof(complaintsbuff), "%s", p);
+    } else {
+        static const char newsmaster[] = NEWSMASTER;
+
+        if ((p = PERMaccessconf->fromhost) != NULL && strchr(newsmaster, '@') == NULL) {
+            snprintf(complaintsbuff, sizeof(complaintsbuff), "%s@%s",
+                     newsmaster, p);
+        } else {
+            snprintf(complaintsbuff, sizeof(complaintsbuff), "%s",
+                     newsmaster);
+        }
     }
-    HDR_SET(HDR__XCOMPLAINTSTO, complaintsbuff);
 
+    snprintf(injectioninfobuff, sizeof(injectioninfobuff),
+             "%s%s;\r\n\tlogging-data=\"%ld\"; mail-complaints-to=\"%s\"",
+             pathidentitybuff,
+             PERMaccessconf->addinjectionpostinghost ? postinghostbuff : "",
+             (long) pid, complaintsbuff);
+
+    HDR_SET(HDR__INJECTION_INFO, injectioninfobuff);
+
     /* Clear out some headers that should not be here. */
     if (!ihave && PERMaccessconf->strippostcc) {
 	HDR_CLEAR(HDR__CC);

Modified: nnrpd/post.h
===================================================================
--- nnrpd/post.h	2009-12-24 12:06:25 UTC (rev 8856)
+++ nnrpd/post.h	2009-12-24 12:08:00 UTC (rev 8857)
@@ -51,10 +51,6 @@
 #define HDR__DISTRIBUTION    13
 #define HDR__EXPIRES	     14
 #define HDR__MESSAGEID	     15
-#define HDR__NNTPPOSTINGHOST 18
-#define HDR__XTRACE          22
-#define HDR__XCOMPLAINTSTO   23
-#define HDR__NNTPPOSTINGDATE 24
 #define HDR__INJECTION_DATE  26
 #define HDR__INJECTION_INFO  27
 #define HDR__CC		     36

Modified: samples/inn.conf.in
===================================================================
--- samples/inn.conf.in	2009-12-24 12:06:25 UTC (rev 8856)
+++ samples/inn.conf.in	2009-12-24 12:08:00 UTC (rev 8857)
@@ -106,8 +106,8 @@
 
 # Posting
 
-addnntppostingdate:     true
-addnntppostinghost:     true
+addinjectiondate:       true
+addinjectionpostinghost: true
 checkincludedtext:      false
 #complaints:
 #fromhost:

Modified: scripts/innupgrade.in
===================================================================
--- scripts/innupgrade.in	2009-12-24 12:06:25 UTC (rev 8856)
+++ scripts/innupgrade.in	2009-12-24 12:08:00 UTC (rev 8857)
@@ -22,6 +22,8 @@
 ##   * Clean up inn.conf for the new parser in INN 2.4.
 ##   * Add the hismethod parameter to inn.conf if not found.
 ##   * Rename nntpactsync to incominglogfrequency in inn.conf.
+##   * Rename addnntppostingdate and addnntppostinghost to respectively
+##     addinjectiondate and addinjectionpostinghost in inn.conf.
 ##   * Move parameters from overview.fmt to inn.conf if needed.
 ##   * Move parameters from sasl.conf to inn.conf if needed.
 ##   * Change startinnfeed to innfeed or imapfeed in newsfeeds.
@@ -105,6 +107,12 @@
         if ($key eq 'nntpactsync') {
             $key = 'incominglogfrequency';
         }
+        if ($key eq 'addnntppostingdate') {
+            $key = 'addinjectiondate';
+        }
+        if ($key eq 'addnntppostinghost') {
+            $key = 'addinjectionpostinghost';
+        }
 
         # A list value (on only one line).
         # This condition must occur after having checked for $overview.

Modified: tests/data/upgrade/inn.conf
===================================================================
--- tests/data/upgrade/inn.conf	2009-12-24 12:06:25 UTC (rev 8856)
+++ tests/data/upgrade/inn.conf	2009-12-24 12:08:00 UTC (rev 8857)
@@ -2,6 +2,8 @@
     mta:	/usr/lib/sendmail -oi -oem %s
 
 nntpactsync:	200
+addnntppostingdate:   true
+addnntppostinghost:   false
 listvalue:      [ one two three ]
 
 # testing comment

Modified: tests/data/upgrade/inn.conf.ok
===================================================================
--- tests/data/upgrade/inn.conf.ok	2009-12-24 12:06:25 UTC (rev 8856)
+++ tests/data/upgrade/inn.conf.ok	2009-12-24 12:08:00 UTC (rev 8857)
@@ -2,6 +2,8 @@
     mta:	"/usr/lib/sendmail -oi -oem %s"
 
 incominglogfrequency:	200
+addinjectiondate:   true
+addinjectionpostinghost:   false
 listvalue:      [ one two three ]
 
 # testing comment




More information about the inn-committers mailing list