Back out the token name changes.

[~andy/fetchmail] / rcfile_l.l

diff --git a/rcfile_l.l b/rcfile_l.l
index 5cfdc0812448ffcf9776f092f544b4ed6a1ba31d..3a6af9d314b19780bf759f2ac796e243f062cccc 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -26,20 +26,22 @@ int prc_lineno = 1;
 defaults       { return KW_DEFAULTS; }
 server                 { return KW_SERVER; }
 proto(col)?    { return KW_PROTOCOL; }
+is             { return KW_LOCALNAME; }
 user(name)?    { return KW_USERNAME; }
 pass(word)?    { return KW_PASSWORD; }
-remote(folder)? { return KW_REMOTEFOLDER; }
+remote(folder)? { return KW_FOLDER; }
 smtp(host)?    { return KW_SMTPHOST; }
-keep           { yylval.flag = TRUE; return KW_KEEP; }
-flush          { yylval.flag = TRUE; return KW_FLUSH; }
-fetchall       { yylval.flag = TRUE; return KW_FETCHALL; }
-rewrite                { yylval.flag = TRUE; return KW_REWRITE; }
-skip           { yylval.flag = TRUE; return KW_SKIP; }
-nokeep         { yylval.flag = FALSE; return KW_KEEP; }
-noflush                { yylval.flag = FALSE; return KW_FLUSH; }
-nofetchall     { yylval.flag = FALSE; return KW_FETCHALL; }
-norewrite      { yylval.flag = FALSE; return KW_REWRITE; }
-noskip         { yylval.flag = FALSE; return KW_SKIP; }
+mda            { return KW_MDA; }
+keep           { yylval.flag = FLAG_TRUE; return KW_KEEP; }
+flush          { yylval.flag = FLAG_TRUE; return KW_FLUSH; }
+fetchall       { yylval.flag = FLAG_TRUE; return KW_FETCHALL; }
+rewrite                { yylval.flag = FLAG_TRUE; return KW_REWRITE; }
+skip           { yylval.flag = FLAG_TRUE; return KW_SKIP; }
+nokeep         { yylval.flag = FLAG_FALSE; return KW_KEEP; }
+noflush                { yylval.flag = FLAG_FALSE; return KW_FLUSH; }
+nofetchall     { yylval.flag = FLAG_FALSE; return KW_FETCHALL; }
+norewrite      { yylval.flag = FLAG_FALSE; return KW_REWRITE; }
+noskip         { yylval.flag = FLAG_FALSE; return KW_SKIP; }
 port           { return KW_PORT; }
 
 (auto)|(AUTO)  { yylval.proto = P_AUTO;  return KW_PROTO; }