RC file syntax change, folder->mailbox, remote->remotename.

[~andy/fetchmail] / rcfile_y.y

diff --git a/rcfile_y.y b/rcfile_y.y
index a899315de9313ec0cd273e6799772540b67c21f4..94b81d8b15a0e632e65b5432310a840d6afa3aa6 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -29,8 +29,8 @@ int yydebug;  /* in case we didn't generate with -- debug */
   char *sval;
 }
 
-%token KW_SERVER KW_PROTOCOL KW_USERNAME KW_PASSWORD
-%token KW_REMOTEFOLDER KW_SMTPHOST KW_MDA KW_DEFAULTS
+%token KW_SERVER KW_PROTOCOL KW_LOCALNAME KW_REMOTENAME KW_PASSWORD
+%token KW_MAILBOX KW_SMTPHOST KW_MDA KW_DEFAULTS
 %token <proto> KW_PROTO
 %token <sval>  PARAM_STRING
 %token <flag>  KW_KEEP KW_FLUSH KW_FETCHALL KW_REWRITE KW_PORT KW_SKIP
@@ -63,9 +63,10 @@ server_options:      serv_option_clause
 
 serv_option_clause: 
                KW_PROTOCOL KW_PROTO         {prc_setproto($2);}
-       |       KW_USERNAME PARAM_STRING     {prc_remotename($2);}
+       |       KW_LOCALNAME PARAM_STRING    {prc_localname($2);}
+       |       KW_REMOTENAME PARAM_STRING   {prc_remotename($2);}
        |       KW_PASSWORD PARAM_STRING     {prc_setpassword($2);}
-       |       KW_REMOTEFOLDER PARAM_STRING {prc_setremote($2);}
+       |       KW_MAILBOX PARAM_STRING      {prc_setmailbox($2);}
        |       KW_SMTPHOST PARAM_STRING     {prc_setsmtphost($2);}
        |       KW_MDA PARAM_STRING          {prc_setmda($2);}
        |       KW_KEEP                      {prc_setkeep($1==FLAG_TRUE);}