From: bitblt <bitblt@openbsd.org>
Date: Thu, 2 Jan 1997 19:49:50 +0000 (+0000)
Subject: Fix for the shift-reduce conflict, contributed by dholland@hcs.harvard.edu,
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=40916ffb4bb4159acf711cbd211fe8ab282534e7;p=openbsd

Fix for the shift-reduce conflict, contributed by dholland@hcs.harvard.edu,
who is porting the OpenBSD ftpd to (of all things) Linux.
---

diff --git a/libexec/ftpd/ftpcmd.y b/libexec/ftpd/ftpcmd.y
index 95f11b64203..3dfc7578066 100644
--- a/libexec/ftpd/ftpcmd.y
+++ b/libexec/ftpd/ftpcmd.y
@@ -448,9 +448,9 @@ cmd
 	       		    "Current IDLE time limit is %d seconds; max %d",
 				timeout, maxtimeout);
 		}
-	| SITE SP IDLE check_login SP NUMBER CRLF
+	| SITE SP check_login IDLE SP NUMBER CRLF
 		{
-			if ($4) {
+			if ($3) {
 				if ($6 < 30 || $6 > maxtimeout) {
 				reply(501,
 	       		 "Maximum IDLE time must be between 30 and %d seconds",