Rename bad-header pass to bad-header accept, ...

to resolve an ambiguity found by Frédéric Marchal.

diff --git a/NEWS b/NEWS
index a62a9efdd6f42b6a4d773cbb15cfb6c2bc8c305e..511db278279d874f239f03da5f578a477b3a7c36 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -51,9 +51,8 @@ fetchmail 6.3.15 (not yet released):
 
 # FEATURE
 * Fetchmail now supports a bad-header command line or rcfile option that takes
-  exactly one argument, pass or reject (default).  If set to pass, fetchmail
-  will pass messages with bad headers on.  This has been rejected for a long
-  time, and the right behaviour was disputed for too long.
+  exactly one argument, accept or reject (default).  This specifies how messages
+  with bad headers retrieved from the current server are to be treated.
 
 # BUG FIXES
 * In the rcfile, recognize "local" as abbreviation for "localdomains", as

diff --git a/conf.c b/conf.c
index 5b5d877908a879506bb0b6c8a6ae5f8e5331fb14..57581381ae8f5f1d97b52d693493433ef6c3bc29 100644 (file)
--- a/conf.c
+++ b/conf.c
@@ -317,7 +317,7 @@ void dump_config(struct runctl *runp, struct query *querylist)
                /* this is a hack - we map this to a boolean option for
                 * fetchmailconf purposes */
                case BHREJECT: puts("'badheader': FALSE,"); break;
-               case BHPASS:   puts("'badheader': TRUE,"); break;
+               case BHACCEPT: puts("'badheader': TRUE,"); break;
            }
 
            indent(0);

diff --git a/fetchmail.c b/fetchmail.c
index b865d092b1221554cbc47111271eb8c096240e35..43c1e98c6174f4e3b03653971c91e489a1c2380f 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -1956,7 +1956,7 @@ static void dump_params (struct runctl *runp,
                if (outlevel >= O_VERBOSE)
                    printf(GT_("  Messages with bad headers will be rejected.\n"));
                break;
-           case BHPASS:
+           case BHACCEPT:
                printf(GT_("  Messages with bad headers will be passed on.\n"));
                break;
        }

diff --git a/fetchmail.h b/fetchmail.h
index 88f7dd33ae495ed2b2de9ccd18f492a0a9dbf46e..b43999f911f7915ccd93d8e0296cb4b55cb60ccb 100644 (file)
--- a/fetchmail.h
+++ b/fetchmail.h
@@ -245,7 +245,7 @@ struct method               /* describe methods for protocol state machine */
     flag retry;                        /* can getrange poll for new messages? */
 };
 
-enum badheader { BHREJECT = 0, BHPASS };
+enum badheader { BHREJECT = 0, BHACCEPT };
 
 struct hostdata                /* shared among all user connections to given server */
 {

diff --git a/fetchmail.man b/fetchmail.man
index 30d4697118b0925b2d1d36c1e3f17731c8f58482..636e8b4ba3df6e10d3a7fbd4fe6223823b898691 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -700,12 +700,12 @@ reconstruction of MAIL FROM and RCPT TO lines is not guaranteed
 correct; the caveats discussed under THE USE AND ABUSE OF MULTIDROP
 MAILBOXES below apply.
 .TP
-.B \-\-bad\-header {reject|pass}
+.B \-\-bad\-header {reject|accept}
 (Keyword: bad\-header; since v6.3.15)
 .br
 Specify how fetchmail is supposed to treat messages with bad headers,
 i. e. headers with bad syntax. Traditionally, fetchmail has rejected such
-messages, but some distributors modified fetchmail to pass them. You can now
+messages, but some distributors modified fetchmail to accept them. You can now
 configure fetchmail's behaviour per server.
 
 .SS Resource Limit Control Options
@@ -1759,7 +1759,7 @@ esmtppassword     \&      \&      T{
 Set password for RFC2554 authentication to the ESMTP server.
 T}
 bad-header     \&      \&      T{
-How to treat messages with a bad header. Can be reject (default) or pass.
+How to treat messages with a bad header. Can be reject (default) or accept.
 T}
 .TE
 

diff --git a/fetchmailconf.py b/fetchmailconf.py
index 4aae48f8a5de064fbb59a1bce6e8488b68ac558b..9bfdda0df529f2e9380f0c3cea3720d86f028643 100755 (executable)
--- a/fetchmailconf.py
+++ b/fetchmailconf.py
@@ -200,7 +200,7 @@ class Server:
            if folded:
                res = res + "\n"
        if self.badheader:
-               res = res + "bad-header pass "
+               res = res + "bad-header accept "
 
        if res[-1] == " ": res = res[0:-1]
 

diff --git a/options.c b/options.c
index 066a8ab0df02d37f032d7f0cf58a15e2b7166e98..0617bdb07d7fca7a92adbdaf77b218d028ff163f 100644 (file)
--- a/options.c
+++ b/options.c
@@ -313,8 +313,8 @@ int parsecmdline (int argc /** argument count */,
            run.softbounce = TRUE;
            break;
        case LA_BADHEADER:
-           if (strcasecmp(optarg,"pass") == 0) {
-               ctl->server.badheader = BHPASS;
+           if (strcasecmp(optarg,"accept") == 0) {
+               ctl->server.badheader = BHACCEPT;
            } else if (strcasecmp(optarg,"reject") == 0) {
                ctl->server.badheader = BHREJECT;
            } else {
@@ -648,7 +648,7 @@ int parsecmdline (int argc /** argument count */,
 #endif
        P(GT_("      --plugin      specify external command to open connection\n"));
        P(GT_("      --plugout     specify external command to open smtp connection\n"));
-       P(GT_("      --bad-header {reject|pass}\n"
+       P(GT_("      --bad-header {reject|accept}\n"
              "                    specify policy for handling messages with bad headers\n"));
 
        P(GT_("  -p, --protocol    specify retrieval protocol (see man page)\n"));

diff --git a/po/de.po b/po/de.po
index 2bf906a403ca96aa992b728b431a85f27836a8e6..e32bac77b5cb15b1742eb4f6ea3e94a00978a5be 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fetchmail 6.3.15-beta1\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
-"POT-Creation-Date: 2010-02-24 01:55+0100\n"
+"POT-Creation-Date: 2010-02-24 23:25+0100\n"
 "PO-Revision-Date: 2010-02-24 01:58+0100\n"
 "Last-Translator: Matthias Andree <matthias.andree@gmx.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
@@ -2230,11 +2230,12 @@ msgid "      --plugout     specify external command to open smtp connection\n"
 msgstr "      --plugout     externes Kommando zum Öffnen der SMTP-Verbindung\n"
 
 #: options.c:651
+#, fuzzy
 msgid ""
-"      --bad-header {reject|pass}\n"
+"      --bad-header {reject|accept}\n"
 "                    specify policy for handling messages with bad headers\n"
 msgstr ""
-"      --bad-header {reject|pass}\n"
+"      --bad-header {reject|accept}\n"
 "                   Umgang mit Nachrichten mit defekten Headern\n"
 
 #: options.c:654

diff --git a/rcfile_l.l b/rcfile_l.l
index 146219a7b9b87e3607c0d76606713391b06fa847..9a1fe637bac22fcc76004d90a8cbe92a64bbf771 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -114,7 +114,7 @@ principal   { return PRINCIPAL; }
 esmtpname      { return ESMTPNAME; }
 esmtppassword  { return ESMTPPASSWORD; }
 bad-header     { return BADHEADER; }
-pass           { return PASS; }
+accept         { return ACCEPT; }
 reject         { return REJECT_; }
 
 user(name)?    {SETSTATE(NAME); return USERNAME; }

diff --git a/rcfile_y.y b/rcfile_y.y
index b5765d7703c19c055dd1f3a308bccd49050bcdc5..c49ec5f39b3ed113e8c4ebbca9f43002c6db1deb 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -70,7 +70,7 @@ extern char * yytext;
 %token BATCHLIMIT FETCHLIMIT FETCHSIZELIMIT FASTUIDL EXPUNGE PROPERTIES
 %token SET LOGFILE DAEMON SYSLOG IDFILE PIDFILE INVISIBLE POSTMASTER BOUNCEMAIL
 %token SPAMBOUNCE SOFTBOUNCE SHOWDOTS
-%token BADHEADER PASS REJECT_
+%token BADHEADER ACCEPT REJECT_
 %token <proto> PROTO AUTHTYPE
 %token <sval>  STRING
 %token <number> NUMBER
@@ -232,7 +232,7 @@ serv_option : AKA alias_list
                | NO ENVELOPE           {current.server.envelope = STRING_DISABLED;}
                | TRACEPOLLS            {current.server.tracepolls = FLAG_TRUE;}
                | NO TRACEPOLLS         {current.server.tracepolls = FLAG_FALSE;}
-               | BADHEADER PASS        {current.server.badheader = BHPASS;}
+               | BADHEADER ACCEPT      {current.server.badheader = BHACCEPT;}
                | BADHEADER REJECT_     {current.server.badheader = BHREJECT;}
                ;
 

diff --git a/transact.c b/transact.c
index 9d151607e2a0c93f0e2bd7fb7c924854b265f52c..857d7a3555ea370677df698fa8c1cd0b182d5ab9 100644 (file)
--- a/transact.c
+++ b/transact.c
@@ -584,7 +584,7 @@ eoh:
             * MacGregor)
             */
            if (!refuse_mail
-               && !ctl->server.badheader == BHPASS
+               && !ctl->server.badheader == BHACCEPT
                && !isspace((unsigned char)line[0])
                && !strchr(line, ':'))
            {