summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorbitblt <bitblt@cvs.openbsd.org>1997-01-02 19:49:51 +0000
committerbitblt <bitblt@cvs.openbsd.org>1997-01-02 19:49:51 +0000
commit686e8c39a28cd4bea1b0302e84c21e01b931004c (patch)
treeef9e894a21b557a03ccc48b8a362f0193bedf4b7 /libexec
parent44c6e37a5c82b902190ae8ebbc981bd9b2862eea (diff)
Fix for the shift-reduce conflict, contributed by dholland@hcs.harvard.edu,
who is porting the OpenBSD ftpd to (of all things) Linux.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/ftpd/ftpcmd.y4
1 files changed, 2 insertions, 2 deletions
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",