From ea8294a37ef78608fc3b50c8363e64d93d2d491d Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 19 Feb 2001 20:31:30 +0000
Subject: preauth -> auth.

svn path=/trunk/; revision=3121
---
 rcfile_y.y | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'rcfile_y.y')

diff --git a/rcfile_y.y b/rcfile_y.y
index a99dff38..6398016d 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -59,7 +59,7 @@ extern char * yytext;
 }
 
 %token DEFAULTS POLL SKIP VIA AKA LOCALDOMAINS PROTOCOL ANY
-%token PREAUTHENTICATE TIMEOUT KPOP SDPS KERBEROS4 KERBEROS5 KERBEROS GSSAPI
+%token AUTHENTICATE TIMEOUT KPOP SDPS KERBEROS4 KERBEROS5 KERBEROS GSSAPI
 %token SSH ENVELOPE QVIRTUAL USERNAME PASSWORD FOLDER SMTPHOST MDA BSMTP LMTP
 %token SMTPADDRESS SMTPNAME SPAMRESPONSE PRECONNECT POSTCONNECT LIMIT WARNINGS
 %token NETSEC INTERFACE MONITOR PLUGIN PLUGOUT
@@ -140,11 +140,11 @@ serv_option	: AKA alias_list
 		| PROTOCOL KPOP		{
 					    current.server.protocol = P_POP3;
 
-					    if (current.server.preauthenticate == A_PASSWORD)
+					    if (current.server.authenticate == A_PASSWORD)
 #ifdef KERBEROS_V5
-						current.server.preauthenticate = A_KERBEROS_V5;
+						current.server.authenticate = A_KERBEROS_V5;
 #else
-		    				current.server.preauthenticate = A_KERBEROS_V4;
+		    				current.server.authenticate = A_KERBEROS_V4;
 #endif /* KERBEROS_V5 */
 #if INET6_ENABLE
 					    current.server.service = KPOP_PORT;
@@ -182,25 +182,25 @@ serv_option	: AKA alias_list
 		}
 		| INTERVAL NUMBER
 			{current.server.interval = $2;}
-		| PREAUTHENTICATE ANY
-			{current.server.preauthenticate = A_ANY;}
-		| PREAUTHENTICATE PASSWORD
-			{current.server.preauthenticate = A_PASSWORD;}
-		| PREAUTHENTICATE GSSAPI
-			{current.server.preauthenticate = A_GSSAPI;}
-		| PREAUTHENTICATE KERBEROS4
-			{current.server.preauthenticate = A_KERBEROS_V4;}
-                | PREAUTHENTICATE KERBEROS5
-		 	{current.server.preauthenticate = A_KERBEROS_V5;}
-                | PREAUTHENTICATE KERBEROS         {
+		| AUTHENTICATE ANY
+			{current.server.authenticate = A_ANY;}
+		| AUTHENTICATE PASSWORD
+			{current.server.authenticate = A_PASSWORD;}
+		| AUTHENTICATE GSSAPI
+			{current.server.authenticate = A_GSSAPI;}
+		| AUTHENTICATE KERBEROS4
+			{current.server.authenticate = A_KERBEROS_V4;}
+                | AUTHENTICATE KERBEROS5
+		 	{current.server.authenticate = A_KERBEROS_V5;}
+                | AUTHENTICATE KERBEROS         {
 #ifdef KERBEROS_V5
-		    current.server.preauthenticate = A_KERBEROS_V5;
+		    current.server.authenticate = A_KERBEROS_V5;
 #else
-		    current.server.preauthenticate = A_KERBEROS_V4;
+		    current.server.authenticate = A_KERBEROS_V4;
 #endif /* KERBEROS_V5 */
 		}
-                | PREAUTHENTICATE SSH
-		 	{current.server.preauthenticate = A_SSH;}
+                | AUTHENTICATE SSH
+		 	{current.server.authenticate = A_SSH;}
 		| TIMEOUT NUMBER
 			{current.server.timeout = $2;}
 		| ENVELOPE NUMBER STRING 
-- 
cgit v1.2.3