INN commit: branches/2.5 (3 files)
INN Commit
rra at isc.org
Thu Jan 28 20:45:16 UTC 2010
Date: Thursday, January 28, 2010 @ 12:45:16
Author: iulius
Revision: 8941
Revert commit [8933]. No longer check how many headers an
article has when posted via inews.
Modified:
branches/2.5/doc/pod/inews.pod
branches/2.5/doc/pod/news.pod
branches/2.5/frontends/inews.c
-------------------+
doc/pod/inews.pod | 7 +------
doc/pod/news.pod | 12 +++++-------
frontends/inews.c | 14 ++------------
3 files changed, 8 insertions(+), 25 deletions(-)
Modified: doc/pod/inews.pod
===================================================================
--- doc/pod/inews.pod 2010-01-28 20:44:07 UTC (rev 8940)
+++ doc/pod/inews.pod 2010-01-28 20:45:16 UTC (rev 8941)
@@ -4,7 +4,7 @@
=head1 SYNOPSIS
-B<inews> [B<-ADhNORSVW>] [B<-acdeFfmnortwx> I<value>] [B<-p> I<port>] [I<file>]
+B<inews> [B<-ADhNORSVW>] [B<-acdeFfnortwx> I<value>] [B<-p> I<port>] [I<file>]
=head1 DESCRIPTION
@@ -90,11 +90,6 @@
desired headers have to be specified with command-line options as
described above.
-=item B<-m> I<value>
-
-Articles that contain more than I<value> header fields are rejected.
-The default is C<50>.
-
=item B<-O>
By default, an Organization header will be added if none is present in the
Modified: doc/pod/news.pod
===================================================================
--- doc/pod/news.pod 2010-01-28 20:44:07 UTC (rev 8940)
+++ doc/pod/news.pod 2010-01-28 20:45:16 UTC (rev 8941)
@@ -119,13 +119,6 @@
=item *
-A new option has been added to B<inews>. When the B<-m> flag is specified,
-the corresponding value will be used to determine the maximum number of
-header fields that are accepted for an article. The default was C<50>
-and it is now configurable. Thanks to Torsten Jerzembeck for the bug report.
-
-=item *
-
The B<O> flag in F<newsfeeds> now relies on the contents of the
Injection-Info: header (or X-Trace: header if there is no Injection-Info:
header) to determine the origin of an article.
@@ -288,6 +281,11 @@
=item *
+B<inews> no longer rejects articles that contain more than 50 header
+fields. Thanks to Torsten Jerzembeck for the bug report.
+
+=item *
+
B<news.daily> no longer sends superfluous mails when the B<nomail>
keyword is given. Mail is only sent when there is real output.
Previously, there would always be headings and empty lines useful
Modified: frontends/inews.c
===================================================================
--- frontends/inews.c 2010-01-28 20:44:07 UTC (rev 8940)
+++ frontends/inews.c 2010-01-28 20:45:16 UTC (rev 8941)
@@ -47,7 +47,6 @@
} HEADER;
static bool Dump;
-static int MaxHeadersCount;
static bool Revoked;
static bool Spooling;
static char **OtherHeaders;
@@ -214,7 +213,6 @@
char *q;
HEADER *hp;
char c;
- int i;
/* Set up the other headers list. */
OtherSize = HEADER_DELTA;
@@ -222,7 +220,7 @@
OtherCount = 0;
/* Scan through buffer, a header at a time. */
- for (i = 1, p = article; ; i++) {
+ for (p = article; ; ) {
if ((q = strchr(p, ':')) == NULL)
die("no colon in header line \"%.30s...\"", p);
@@ -256,10 +254,6 @@
break;
}
- /* Too many headers? */
- if (i > MaxHeadersCount)
- die("more than %d header fields", MaxHeadersCount);
-
/* No; add it to the set of other headers. */
if (hp == ARRAY_END(Table)) {
if (OtherCount >= OtherSize - 1) {
@@ -890,7 +884,6 @@
/* Set defaults. */
Mode = '\0';
Dump = false;
- MaxHeadersCount = 50;
DoSignature = true;
AddOrg = true;
port = 0;
@@ -901,7 +894,7 @@
umask(NEWSUMASK);
/* Parse JCL. */
- while ((i = getopt(ac, av, "DNAVWORShx:a:c:d:e:f:m:n:p:r:t:F:o:w:")) != EOF)
+ while ((i = getopt(ac, av, "DNAVWORShx:a:c:d:e:f:n:p:r:t:F:o:w:")) != EOF)
switch (i) {
default:
Usage();
@@ -927,9 +920,6 @@
case 'h':
Mode = i;
break;
- case 'm':
- MaxHeadersCount = atoi(optarg);
- break;
case 'x':
Exclusions = concat(optarg, "!", (char *) 0);
break;
More information about the inn-committers
mailing list