From 93b00943e95dd220c6cb97a7d6d2593e90ff6811 Mon Sep 17 00:00:00 2001 From: ginsbach Date: Thu, 9 Dec 2004 20:58:39 +0000 Subject: [PATCH] Fix inverted test for expired passwords. Mea culpa. --- libexec/ftpd/ftpd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index b1a58f229f26..a54e839ed6b1 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.161 2004/11/19 16:03:58 ginsbach Exp $ */ +/* $NetBSD: ftpd.c,v 1.162 2004/12/09 20:58:39 ginsbach Exp $ */ /* * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ __COPYRIGHT( #if 0 static char sccsid[] = "@(#)ftpd.c 8.5 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: ftpd.c,v 1.161 2004/11/19 16:03:58 ginsbach Exp $"); +__RCSID("$NetBSD: ftpd.c,v 1.162 2004/12/09 20:58:39 ginsbach Exp $"); #endif #endif /* not lint */ @@ -3343,7 +3343,7 @@ checkpassword(const struct passwd *pwent, const char *password) if (strcmp(new, orig) != 0) /* compare */ return 1; - if ((expire && now >= expire) || (change && change >= now)) + if ((expire && now >= expire) || (change && now >= change)) return 2; /* check if expired */ return 0; /* OK! */