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 95f11b6..3dfc757 100644 (file)
--- 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",