X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rcfile_y.y;h=2f028d91610ef65c8d16ae0cc04c6b73cc56987d;hb=ad5ca720795a2f55474a22b63f3a26c2470dd3f2;hp=f20f2ef6775a4a51ebd2f8e18da0d1c239f48fa9;hpb=98bdc445738682c067752f8d467c2b0841fc6306;p=~andy%2Ffetchmail

diff --git a/rcfile_y.y b/rcfile_y.y
index f20f2ef6..2f028d91 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -73,7 +73,7 @@ extern char * yytext;
 %token NO KEEP FLUSH LIMITFLUSH FETCHALL REWRITE FORCECR STRIPCR PASS8BITS 
 %token DROPSTATUS DROPDELIVERED
 %token DNS SERVICE PORT UIDL INTERVAL MIMEDECODE IDLE CHECKALIAS 
-%token SSL SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTFILE SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT
+%token SSL_ SSLKEY SSLCERT SSLPROTO SSLCERTCK SSLCERTFILE SSLCERTPATH SSLCOMMONNAME SSLFINGERPRINT
 %token PRINCIPAL ESMTPNAME ESMTPPASSWORD
 %token TRACEPOLLS
 
@@ -176,8 +176,8 @@ serv_option	: AKA alias_list
 					    yyerror(GT_("SDPS not enabled."));
 #endif /* SDPS_ENABLE */
 					}
-		| UIDL			{current.server.uidl = FLAG_TRUE;}
-		| NO UIDL		{current.server.uidl  = FLAG_FALSE;}
+		| UIDL			{/* EMPTY - removed in 7.0.0 */}
+		| NO UIDL		{/* EMPTY - removed in 7.0.0 */}
 		| CHECKALIAS            {current.server.checkalias = FLAG_TRUE;}
 		| NO CHECKALIAS         {current.server.checkalias  = FLAG_FALSE;}
 		| SERVICE STRING	{
@@ -338,7 +338,7 @@ user_option	: TO mapping_list HERE
 		| MIMEDECODE		{current.mimedecode  = FLAG_TRUE;}
 		| IDLE			{current.idle        = FLAG_TRUE;}
 
-		| SSL 	                {
+		| SSL_ 	                {
 #ifdef SSL_ENABLE
 		    current.use_ssl = FLAG_TRUE;
 #else
@@ -367,7 +367,7 @@ user_option	: TO mapping_list HERE
 		| NO MIMEDECODE		{current.mimedecode  = FLAG_FALSE;}
 		| NO IDLE		{current.idle        = FLAG_FALSE;}
 
-		| NO SSL 	        {current.use_ssl     = FLAG_FALSE;}
+		| NO SSL_ 	        {current.use_ssl     = FLAG_FALSE;}
 
 		| LIMIT NUMBER		{current.limit       = NUM_VALUE_IN($2);}
 		| WARNINGS NUMBER	{current.warnings    = NUM_VALUE_IN($2);}
@@ -503,7 +503,8 @@ int prc_parse_file (const char *pathname, const flag securecheck)
 
     yyparse();		/* parse entire file */
 
-    fclose(yyin);	/* not checking this should be safe, file mode was r */
+    if (yyin != stdin)
+       fclose(yyin);	/* not checking this should be safe, file mode was r */
 
     if (prc_errflag) 
 	return(PS_SYNTAX);