From 172ed0c167405cddde6382f0fc01a6396975187a Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 16 Sep 1999 07:27:41 +0000 Subject: auth -> preauth. svn path=/trunk/; revision=2564 --- NEWS | 1 + fetchmail-FAQ.html | 9 +++++++-- fetchmail.man | 12 ++++++------ options.c | 8 ++++---- rcfile_l.l | 6 +++--- rcfile_y.y | 10 +++++----- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/NEWS b/NEWS index ed0dc7ac..89156f8d 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,7 @@ fetchmail-5.0.8 (Tue Sep 14 06:56:50 EDT 1999): probably fail (the RFCs don't support quoting) but it's better than nothing and works with at least one server. * Federico G. Schwindt's fix for NetBSD/OpenBSD --with-kerberos. +* auth keyword and option changed to preauth. There are 264 people on fetchmail-friends and 441 on fetchmail-announce. diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html index ca28c90b..9a83608c 100644 --- a/fetchmail-FAQ.html +++ b/fetchmail-FAQ.html @@ -10,7 +10,7 @@
Back to Fetchmail Home Page To Site Map -$Date: 1999/09/14 10:51:05 $ +$Date: 1999/09/16 07:27:40 $

Frequently Asked Questions About Fetchmail

@@ -589,6 +589,11 @@ once you have installed the `bind' package.

F1. Why does my old .fetchmailrc file no longer work?

+

If your file predates 5.0.8

+ +In 5.0.8, the auth keyword and option were changed to +preauth.

+

If your file predates 4.5.5

If the dns option is on (the default), you may need to @@ -2467,7 +2472,7 @@ inactivity timeout.

Back to Fetchmail Home Page To Site Map -$Date: 1999/09/14 10:51:05 $ +$Date: 1999/09/16 07:27:40 $

Eric S. Raymond <esr@snark.thyrsus.com>
diff --git a/fetchmail.man b/fetchmail.man index 6747ab40..f6d2c24d 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -179,17 +179,17 @@ Use POP3 with MD5 authentication. .IP RPOP Use POP3 with RPOP authentication. .IP KPOP -Use POP3 with Kerberos V4 authentication on port 1109. +Use POP3 with Kerberos V4 preauthentication on port 1109. .IP SDPS Use POP3 with Demon Internet's SDPS extensions. .IP IMAP IMAP2bis, IMAP4, or IMAP4rev1 (\fIfetchmail\fR autodetects their capabilities). .IP IMAP-K4 IMAP4, or IMAP4rev1 (\fIfetchmail\fR autodetects their capabilities) -with RFC 1731 Kerberos v4 authentication. +with RFC 1731 Kerberos v4 preauthentication. .IP IMAP-GSS IMAP4, or IMAP4rev1 (\fIfetchmail\fR autodetects their capabilities) -with RFC 1731 GSSAPI authentication. +with RFC 1731 GSSAPI preauthentication. .IP ETRN Use the ESMTP ETRN option. .RE @@ -259,7 +259,7 @@ mailserver is asked to ship mail to. Hosts are tried in list order; the first one that is up becomes the forwarding or ETRN target for the current run. Normally, `localhost' is added to the end of the list as an invisible default. However, when using ETRN mode or Kerberos -authentication, the FQDN of the machine running fetchmail is added to +preauthentication, the FQDN of the machine running fetchmail is added to the end of the list as an invisible default. Each hostname may have a port number following the host name. The port number is separated from the host name by a slash; the default port is 25 (or ``smtp'' under IPv6). @@ -440,8 +440,8 @@ fetchmail runs with the effective GID set to that of the kmem group .I only when interface data is being collected. .TP -.B \-A, --auth -(Keyword: auth[enticate]) +.B \-A, --preauth +(Keyword: preauth[enticate]) This option permits you to specify a preauthentication type (see USER AUTHENTICATION below for details). The possible values are \&`\fBpassword\fR', `\fBkerberos_v5\fR' and `\fBkerberos\fR' (or, for diff --git a/options.c b/options.c index 5172657d..63362997 100644 --- a/options.c +++ b/options.c @@ -41,7 +41,7 @@ #define LA_PROTOCOL 17 #define LA_UIDL 18 #define LA_PORT 19 -#define LA_AUTHENTICATE 20 +#define LA_PREAUTH 20 #define LA_TIMEOUT 21 #define LA_ENVELOPE 22 #define LA_QVIRTUAL 23 @@ -98,7 +98,7 @@ static const struct option longoptions[] = { {"proto", required_argument, (int *) 0, LA_PROTOCOL }, {"uidl", no_argument, (int *) 0, LA_UIDL }, {"port", required_argument, (int *) 0, LA_PORT }, - {"auth", required_argument, (int *) 0, LA_AUTHENTICATE}, + {"preauth", required_argument, (int *) 0, LA_PREAUTH}, {"timeout", required_argument, (int *) 0, LA_TIMEOUT }, {"envelope", required_argument, (int *) 0, LA_ENVELOPE }, {"qvirtual", required_argument, (int *) 0, LA_QVIRTUAL }, @@ -366,7 +366,7 @@ struct query *ctl; /* option record to be initialized */ #endif /* INET6 */ break; case 'A': - case LA_AUTHENTICATE: + case LA_PREAUTH: if (strcmp(optarg, "password") == 0) ctl->server.preauthenticate = A_PASSWORD; else if (strcmp(optarg, "kerberos") == 0) @@ -581,7 +581,7 @@ struct query *ctl; /* option record to be initialized */ P(_(" -p, --protocol specify retrieval protocol (see man page)\n")); P(_(" -U, --uidl force the use of UIDLs (pop3 only)\n")); P(_(" -P, --port TCP/IP service port to connect to\n")); - P(_(" -A, --auth authentication type (password or kerberos)\n")); + P(_(" -A, --preauth preauthentication type (password or kerberos)\n")); P(_(" -t, --timeout server nonresponse timeout\n")); P(_(" -E, --envelope envelope address header\n")); P(_(" -Q, --qvirtual prefix to remove from local user id\n")); diff --git a/rcfile_l.l b/rcfile_l.l index f5c89b7c..06bda950 100644 --- a/rcfile_l.l +++ b/rcfile_l.l @@ -19,7 +19,7 @@ int prc_lineno = 1; %a 4000 %p 3000 -%s NAME AUTHKIND +%s NAME PREAUTH %% @@ -74,11 +74,11 @@ proto(col)? { return PROTOCOL; } service { return SERVICE; } port { return PORT; } interval { return INTERVAL; } -auth(enticate)? { BEGIN(AUTHKIND); return AUTHENTICATE; } +preauth(enticate)? { BEGIN(PREAUTH); return PREAUTHENTICATE; } kerberos(_v)?4 { BEGIN(0); return KERBEROS4; } kerberos(_v)?5 { BEGIN(0); return KERBEROS5; } kerberos { BEGIN(0); return KERBEROS; } -password { BEGIN(0); return PASSWORD; } +password { BEGIN(0); return PASSWORD; } timeout { return TIMEOUT;} envelope { return ENVELOPE; } qvirtual { return QVIRTUAL; } diff --git a/rcfile_y.y b/rcfile_y.y index 848ebbb7..1c56cc96 100644 --- a/rcfile_y.y +++ b/rcfile_y.y @@ -58,7 +58,7 @@ extern char * yytext; } %token DEFAULTS POLL SKIP VIA AKA LOCALDOMAINS PROTOCOL -%token AUTHENTICATE TIMEOUT KPOP SDPS KERBEROS4 KERBEROS5 KERBEROS +%token PREAUTHENTICATE TIMEOUT KPOP SDPS KERBEROS4 KERBEROS5 KERBEROS %token ENVELOPE QVIRTUAL USERNAME PASSWORD FOLDER SMTPHOST MDA BSMTP LMTP %token SMTPADDRESS SPAMRESPONSE PRECONNECT POSTCONNECT LIMIT WARNINGS %token NETSEC INTERFACE MONITOR PLUGIN PLUGOUT @@ -167,10 +167,10 @@ serv_option : AKA alias_list #endif /* !INET6 */ } | INTERVAL NUMBER {current.server.interval = $2;} - | AUTHENTICATE PASSWORD {current.server.preauthenticate = A_PASSWORD;} - | AUTHENTICATE KERBEROS4 {current.server.preauthenticate = A_KERBEROS_V4;} - | AUTHENTICATE KERBEROS5 {current.server.preauthenticate = A_KERBEROS_V5;} - | AUTHENTICATE KERBEROS { + | PREAUTHENTICATE PASSWORD {current.server.preauthenticate = A_PASSWORD;} + | PREAUTHENTICATE KERBEROS4 {current.server.preauthenticate = A_KERBEROS_V4;} + | PREAUTHENTICATE KERBEROS5 {current.server.preauthenticate = A_KERBEROS_V5;} + | PREAUTHENTICATE KERBEROS { #ifdef KERBEROS_V5 current.server.preauthenticate = A_KERBEROS_V5; #else -- cgit v1.2.3