X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=rcfile_l.l;h=bff5b6c018a41a4000208b343a061239831f294f;hb=ad5ca720795a2f55474a22b63f3a26c2470dd3f2;hp=db783efb7413b3fbd06be8d0866738ed03b3041a;hpb=13730e67a38a0d394fa80078bd96798e31ae8a0a;p=~andy%2Ffetchmail

diff --git a/rcfile_l.l b/rcfile_l.l
index db783efb..bff5b6c0 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -5,13 +5,14 @@
  *
  * For license terms, see the file COPYING in this directory.
  */
-#include <string.h>
 
 #include "config.h"
 #include "fetchmail.h"
 #include "xmalloc.h"
 #include "rcfile_y.h"
 
+#include <string.h>
+
 int prc_lineno = 1;
 
 #ifdef LEXDEBUG
@@ -41,11 +42,6 @@ int prc_lineno = 1;
 			return STRING;
 		}
 
-"*"		{
-		 	SETSTATE(0);
-			return WILDCARD;
-		}
-
 <NAME>[^=;:, \t\r\n]+	{
 			char *in = xstrdup(yytext);
 			escapes(in, in);
@@ -84,9 +80,8 @@ preauth(enticate)?	{ SETSTATE(AUTH); return AUTHENTICATE; }
 auth(enticate)?	{ SETSTATE(AUTH); return AUTHENTICATE; }
 any		{ SETSTATE(0); yylval.proto = A_ANY; return AUTHTYPE;}
 gssapi		{ SETSTATE(0); yylval.proto = A_GSSAPI; return AUTHTYPE;}
-kerberos(_v)?4	{ SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;}
 kerberos(_v)?5	{ SETSTATE(0); yylval.proto = A_KERBEROS_V5; return AUTHTYPE;}
-kerberos	{ SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;}
+kerberos	{ SETSTATE(0); yylval.proto = A_KERBEROS_V5; return AUTHTYPE;}
 ssh		{ SETSTATE(0); yylval.proto = A_SSH; return AUTHTYPE;}
 external	{ SETSTATE(0); yylval.proto = A_EXTERNAL; return AUTHTYPE;}
 (otp|opie)	{ SETSTATE(0); yylval.proto = A_OTP; return AUTHTYPE;}
@@ -94,6 +89,7 @@ cram(-md5)?	{ SETSTATE(0); yylval.proto = A_CRAM_MD5; return AUTHTYPE;}
 msn		{ SETSTATE(0); yylval.proto = A_MSN; return AUTHTYPE;}
 ntlm		{ SETSTATE(0); yylval.proto = A_NTLM; return AUTHTYPE;}
 <AUTH>password	{ SETSTATE(0); yylval.proto = A_PASSWORD; return AUTHTYPE;}
+apop		{ SETSTATE(0); yylval.proto = A_APOP; return AUTHTYPE;}
 timeout		{ return TIMEOUT;}
 envelope	{ return ENVELOPE; }
 qvirtual	{ return QVIRTUAL; }
@@ -109,6 +105,9 @@ continue	{ return CONTINUE; }
 markseen	{ return MARKSEEN; }
 
 user(name)?	{SETSTATE(NAME); return USERNAME; }
+pwmd_socket	{ return PWMD_SOCKET; }
+pwmd_file	{ return PWMD_FILE; }
+pinentry_timeout	{ return PINENTRY_TIMEOUT; }
 <INITIAL,NAME>pass(word)?	{SETSTATE(NAME); return PASSWORD; }
 folder(s)? 	{ return FOLDER; }
 smtp(host)?	{ return SMTPHOST; }
@@ -176,7 +175,7 @@ mimedec(ode)?   { return MIMEDECODE; }
 idle		{ return IDLE; }
 dns		{ return DNS; }
 uidl		{ return UIDL; }
-ssl		{ return SSL; }
+ssl		{ return SSL_; }
 sslkey		{ return SSLKEY; }
 sslcert		{ return SSLCERT; }
 sslproto	{ return SSLPROTO; }
@@ -197,14 +196,11 @@ options		{/* EMPTY */}
 [;:,]		{/* EMPTY */}
 
 (auto)|(AUTO)	{ yylval.proto = P_AUTO;  return PROTO; }
-(pop2)|(POP2)	{ yylval.proto = P_POP2;  return PROTO; }
-(sdps)|(SDPS)   { return SDPS; }
+(sdps)|(SDPS)	{ return SDPS; }
 (pop3)|(POP3)	{ yylval.proto = P_POP3;  return PROTO; }
 (imap)|(IMAP)	{ yylval.proto = P_IMAP;  return PROTO; }
-(apop)|(APOP)   { yylval.proto = P_APOP;  return PROTO; }
-(rpop)|(RPOP)   { yylval.proto = P_RPOP;  return PROTO; }
-(etrn)|(ETRN)   { yylval.proto = P_ETRN;  return PROTO; }
-(odmr)|(ODMR)   { yylval.proto = P_ODMR;  return PROTO; }
+(etrn)|(ETRN)	{ yylval.proto = P_ETRN;  return PROTO; }
+(odmr)|(ODMR)	{ yylval.proto = P_ODMR;  return PROTO; }
 (kpop)|(KPOP)	{ return KPOP; }
 
 (#.*)?\\?\n	{ prc_lineno++;	}   /* newline is ignored */