From 28ac3fc988917a1f6b9df8edb762b29d328f1821 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Mon, 12 Feb 2001 03:38:05 +0000
Subject: Trivially get rid of 60 conflicts.

svn path=/trunk/; revision=3075
---
 rcfile_y.y | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'rcfile_y.y')

diff --git a/rcfile_y.y b/rcfile_y.y
index f02980ba..a99dff38 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -180,12 +180,18 @@ serv_option	: AKA alias_list
 					current.server.port = $2;
 #endif /* INET6_ENABLE */
 		}
-		| 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;}
+		| 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         {
 #ifdef KERBEROS_V5
 		    current.server.preauthenticate = A_KERBEROS_V5;
@@ -193,12 +199,10 @@ serv_option	: AKA alias_list
 		    current.server.preauthenticate = A_KERBEROS_V4;
 #endif /* KERBEROS_V5 */
 		}
-                | PREAUTHENTICATE GSSAPI         {
-		    current.server.preauthenticate = A_GSSAPI;
-		}
-                | PREAUTHENTICATE SSH 	{current.server.preauthenticate = A_SSH;}
-		| TIMEOUT NUMBER	{current.server.timeout = $2;}
-
+                | PREAUTHENTICATE SSH
+		 	{current.server.preauthenticate = A_SSH;}
+		| TIMEOUT NUMBER
+			{current.server.timeout = $2;}
 		| ENVELOPE NUMBER STRING 
 					{
 					    current.server.envelope = 
-- 
cgit v1.2.3