Change handling of skip option.

svn path=/trunk/; revision=538

2 files changed, 4 insertions, 5 deletions

diff --git a/rcfile_l.l b/rcfile_l.l
index 4a16a0f8..465062aa 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -24,6 +24,7 @@ batchlimit	{ return BATCHLIMIT; }
 defaults 	{ return DEFAULTS; }
 server 		{ return POLL; }
 poll		{ return POLL; }
+skip		{ return SKIP; }
 proto(col)? 	{ return PROTOCOL; }
 port		{ return PORT; }
 auth(enticate)?	{ return AUTHENTICATE; }
@@ -45,12 +46,10 @@ keep		{ yylval.flag = FLAG_TRUE;  return KEEP; }
 flush		{ yylval.flag = FLAG_TRUE;  return FLUSH; }
 fetchall	{ yylval.flag = FLAG_TRUE;  return FETCHALL; }
 rewrite		{ yylval.flag = FLAG_FALSE; return REWRITE; }
-skip		{ yylval.flag = FLAG_TRUE;  return SKIP; }
 nokeep		{ yylval.flag = FLAG_FALSE; return KEEP; }
 noflush		{ yylval.flag = FLAG_FALSE; return FLUSH; }
 nofetchall	{ yylval.flag = FLAG_FALSE; return FETCHALL; }
 norewrite	{ yylval.flag = FLAG_TRUE;  return REWRITE; }
-noskip		{ yylval.flag = FLAG_FALSE; return SKIP; }
 limit		{ return LIMIT; }
 
 with		{/* EMPTY */}
diff --git a/rcfile_y.y b/rcfile_y.y
index ea95dfad..22fbd8db 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -41,13 +41,13 @@ static void prc_reset();
   char *sval;
 }
 
-%token DEFAULTS POLL PROTOCOL AUTHENTICATE TIMEOUT KPOP KERBEROS
+%token DEFAULTS POLL SKIP PROTOCOL AUTHENTICATE TIMEOUT KPOP KERBEROS
 %token USERNAME PASSWORD FOLDER SMTPHOST MDA IS HERE THERE TO MAP LIMIT
 %token SET BATCHLIMIT 
 %token <proto> PROTO
 %token <sval>  STRING
 %token <number> NUMBER
-%token <flag>  KEEP FLUSH FETCHALL REWRITE PORT SKIP
+%token <flag>  KEEP FLUSH FETCHALL REWRITE PORT
 
 /* these are actually used by the lexer */
 %token FLAG_TRUE	2
@@ -70,7 +70,7 @@ statement	: define_server serverspecs userspecs
 
 define_server	: POLL STRING	{strcpy(current.servername, $2);}
 		| SKIP STRING	{strcpy(current.servername, $2);
-						current.skip=($1==FLAG_TRUE);}
+						current.skip = TRUE;}
 		| DEFAULTS	{strcpy(current.servername,"defaults");}
   		;