Avoid KERBEROS_V4 redefinition.

svn path=/trunk/; revision=1005

diff --git a/rcfile_l.l b/rcfile_l.l
index a23e4dc0a7fb53f9d4565406b39de98c73b0fa64..f50062c16c94f4416a79458aabacccf09a61d1d3 100644 (file)
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -34,8 +34,8 @@ local(domains)        { return LOCALDOMAINS; }
 proto(col)?    { return PROTOCOL; }
 port           { return PORT; }
 auth(enticate)?        { return AUTHENTICATE; }
-kerberos_v4    { return KERBEROS_V4; }
-kerberos       { return KERBEROS_V4; }
+kerberos_v4    { return KERBEROS4; }
+kerberos       { return KERBEROS4; }
 timeout                { return TIMEOUT;}
 envelope       { return ENVELOPE; }
 

diff --git a/rcfile_y.y b/rcfile_y.y
index 003854b883e6fdf9b1f07dadb12a42f70ea95d8e..c5da848ae66cd6b378760e177bd8023ac3caabdc 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -42,7 +42,7 @@ static int reset_server(char *name, int skip);
 }
 
 %token DEFAULTS POLL SKIP AKA LOCALDOMAINS PROTOCOL
-%token AUTHENTICATE TIMEOUT KPOP KERBEROS_V4
+%token AUTHENTICATE TIMEOUT KPOP KERBEROS4
 %token ENVELOPE USERNAME PASSWORD FOLDER SMTPHOST MDA PRECONNECT LIMIT
 %token IS HERE THERE TO MAP WILDCARD
 %token SET BATCHLIMIT FETCHLIMIT LOGFILE DAEMON INTERFACE MONITOR
@@ -122,7 +122,7 @@ serv_option : AKA alias_list
                | NO UIDL               {current.server.uidl  = FLAG_FALSE;}
                | PORT NUMBER           {current.server.port = $2;}
                | AUTHENTICATE PASSWORD {current.server.authenticate = A_PASSWORD;}
-               | AUTHENTICATE KERBEROS_V4      {current.server.authenticate = A_KERBEROS_V4;}
+               | AUTHENTICATE KERBEROS4        {current.server.authenticate = A_KERBEROS_V4;}
                | TIMEOUT NUMBER        {current.server.timeout = $2;}
                | ENVELOPE STRING       {current.server.envelope = xstrdup($2);}
                | INTERFACE STRING      {