Commit b2c3f987 authored by Eric S. Raymond's avatar Eric S. Raymond

Back out the token name changes.

svn path=/trunk/; revision=221
parent dba153ee
......@@ -29,13 +29,6 @@ fetchmail-1.6 ():
* Fix bug that prevented SMTP from being specified on the defaults line.
* Changes in .fetchmailrc syntax: The token `remotefolder' no longer
exists; it has been replaced by `mailbox'. The token `remote' no
longer stands for `remotefolder' but for `remotename', a synonym for
`username'. The purpose of these changes (which should only affect
IMAP and POP2 users setting up for non-default mailboxes) is to prepare
for syntax supporting multiple user queries per host.
* Allow program to run with no .fetchmailrc file again.
fetchmail-1.5 (Thu Oct 3 04:35:15 EDT 1996):
......
......@@ -296,12 +296,10 @@ Legal keywords are:
server
protocol (or proto)
localname (or local)
username (or user)
remotename (or remote)
username (or user)
is
password (or pass)
mailbox
remotefolder (or remote)
smtphost (or smtp)
mda
keep
......@@ -317,7 +315,14 @@ Legal keywords are:
port
.PP
All these correspond to the obvious command-line arguments except
two: \fBpassword\fR and \fBskip\fR.
three: \fBis\fR, \fBpassword\fR and \fBskip\fR.
.PP
The \fBis\fR keyword associates a following local username with the
mailserver usename in the entry. It is intended to be used in
configurations where \fIfetchmail\fR runs as root and retrieves
mail for multiple local users. If no \fBis\fR clause is present,
the default local username is the same as the argument of the
\fBuser\fR keyword.
.PP
The \fBpassword\fR option requires a string argument, which is the password
to be used with the entry's server.
......@@ -368,12 +373,14 @@ Other possibilities (note use of \ to escape newline -- this is now
optional, not required as in older versions):
.nf
server pop.provider.net \e
proto pop3 \e
port 3111 \e
user jsmith \e
pass secret1
server pop.provider.net proto pop3 port 3111 \e
user jsmith pass secret1 is smith
.fi
This associates the local username `smith' with the server username `jsmith'
The local username controls who mail is delivered to; it defaults to the
same as the remote username.
.PP
If you need to include whitespace in a parameter string, enclose the
string in double quotes. Thus:
......
......@@ -26,11 +26,10 @@ int prc_lineno = 1;
defaults { return KW_DEFAULTS; }
server { return KW_SERVER; }
proto(col)? { return KW_PROTOCOL; }
local(name)? { return KW_LOCALNAME; }
user(name)? { return KW_REMOTENAME; }
remote(name)? { return KW_REMOTENAME; }
is { return KW_LOCALNAME; }
user(name)? { return KW_USERNAME; }
pass(word)? { return KW_PASSWORD; }
mailbox { return KW_MAILBOX; }
remote(folder)? { return KW_FOLDER; }
smtp(host)? { return KW_SMTPHOST; }
mda { return KW_MDA; }
keep { yylval.flag = FLAG_TRUE; return KW_KEEP; }
......
......@@ -63,10 +63,10 @@ server_options: serv_option_clause
serv_option_clause:
KW_PROTOCOL KW_PROTO {prc_setproto($2);}
| KW_LOCALNAME PARAM_STRING {prc_localname($2);}
| KW_REMOTENAME PARAM_STRING {prc_remotename($2);}
| KW_LOCALNAME PARAM_STRING {prc_setlocal($2);}
| KW_REMOTENAME PARAM_STRING {prc_setremote($2);}
| KW_PASSWORD PARAM_STRING {prc_setpassword($2);}
| KW_MAILBOX PARAM_STRING {prc_setmailbox($2);}
| KW_MAILBOX PARAM_STRING {prc_setfolder($2);}
| KW_SMTPHOST PARAM_STRING {prc_setsmtphost($2);}
| KW_MDA PARAM_STRING {prc_setmda($2);}
| KW_KEEP {prc_setkeep($1==FLAG_TRUE);}
......
......@@ -21,9 +21,9 @@
# Legal keywords are
# server
# protocol (or proto)
# localname (or local)
# username (or user)
# remotename (or remote)
# is
# remotefolder (or remote)
# password (or pass)
# mailbox
# smtphost (or smtp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment