From owner-cvs-all  Thu Apr 25  9:35: 5 2002
Delivered-To: cvs-all@freebsd.org
Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2F7BD37B42A; Thu, 25 Apr 2002 09:34:58 -0700 (PDT)
Received: by flood.ping.uio.no (Postfix, from userid 2602)
	id A1F5D5309; Thu, 25 Apr 2002 18:34:53 +0200 (CEST)
X-URL: http://www.ofug.org/~des/
X-Disclaimer: The views expressed in this message do not necessarily
  coincide with those of any organisation or company with
  which I am or have been affiliated.
To: Josef Karthauser <joe@tao.org.uk>
Cc: "Jordan K. Hubbard" <jkh@FreeBSD.org>,
	cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/crypto/openssh servconf.c sshd_config
References: <200204250559.g3P5xrS51528@freefall.freebsd.org>
	<xzp662gyq1m.fsf@flood.ping.uio.no>
	<20020425113715.GB21335@genius.tao.org.uk>
From: Dag-Erling Smorgrav <des@ofug.org>
Date: 25 Apr 2002 18:34:52 +0200
In-Reply-To: <20020425113715.GB21335@genius.tao.org.uk>
Message-ID: <xzp8z7bybwz.fsf@flood.ping.uio.no>
Lines: 12
User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

--=-=-=

Josef Karthauser <joe@tao.org.uk> writes:
> Can you find a better way of preventing this:

See the attached patch against -STABLE.  As previously mentioned,
-CURRENT does not suffer from this problem.

DES
-- 
Dag-Erling Smorgrav - des@ofug.org


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=auth-chall.diff

Index: auth-chall.c
===================================================================
RCS file: /home/ncvs/src/crypto/openssh/auth-chall.c,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 auth-chall.c
--- auth-chall.c	28 Sep 2001 01:33:33 -0000	1.2.2.1
+++ auth-chall.c	25 Apr 2002 16:31:18 -0000
@@ -77,7 +77,7 @@
 {
 	static char challenge[1024];
 	struct opie opie;
-	if (opiechallenge(&opie, authctxt->user, challenge) == -1)
+	if (opiechallenge(&opie, authctxt->user, challenge) != 0)
 		return NULL;
 	strlcat(challenge, "\nS/Key Password: ", sizeof challenge);
 	return challenge;

--=-=-=--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message