[From nobody Fri Dec 18 11:34:25 2009
Received: from mail.netbsd.org (mail.NetBSD.org
	[IPv6:2001:4f8:3:7:2e0:81ff:fe52:9ab6])
	by nef.pbox.org (8.13.8/8.13.8/) with ESMTP id nBHFtJ8e018494
	for <agc@nef.pbox.org>; Thu, 17 Dec 2009 16:55:20 +0100 (CET)
Received: by mail.netbsd.org (Postfix)
	id 72E2E63B29D; Thu, 17 Dec 2009 15:55:18 +0000 (UTC)
Delivered-To: agc@netbsd.org
Received: by mail.netbsd.org (Postfix, from userid 0)
	id 2F26763B291; Thu, 17 Dec 2009 15:55:18 +0000 (UTC)
Delivered-To: source-changes-full@NetBSD.org
Received: from cvs.netbsd.org (cvs.NetBSD.org
	[IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd])
	by mail.netbsd.org (Postfix) with ESMTP id AB9C963B23F
	for <source-changes-full@NetBSD.org>;
	Thu, 17 Dec 2009 15:55:16 +0000 (UTC)
Received: by cvs.netbsd.org (Postfix, from userid 500)
	id 8F506175DA; Thu, 17 Dec 2009 15:55:16 +0000 (UTC)
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_126106531684090"
Date: Thu, 17 Dec 2009 15:55:16 +0000
From: "Alistair G. Crooks" <agc@NetBSD.org>
Subject: CVS commit: src/crypto/external/bsd/openssh/dist
To: source-changes-full@NetBSD.org
X-Mailer: log_accum
Message-Id: <20091217155516.8F506175DA@cvs.netbsd.org>
Sender: source-changes-full-owner@NetBSD.org
List-Id: source-changes-full.NetBSD.org
Precedence: list
Reply-To: source-changes-d@NetBSD.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (nef.pbox.org [IPv6:2001:7a8:202:1::1:1]);
	Thu, 17 Dec 2009 16:55:20 +0100 (CET)

This is a multi-part message in MIME format.

--_----------=_126106531684090
Content-Disposition: inline
Content-Length: 471
Content-Transfer-Encoding: binary
Content-Type: text/plain

Module Name:	src
Committed By:	agc
Date:		Thu Dec 17 15:55:16 UTC 2009

Modified Files:
	src/crypto/external/bsd/openssh/dist: ssh-agent.c

Log Message:
Preserve the existing value of an extern variable across the call to
process_sign_request2().


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/ssh-agent.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_126106531684090
Content-Disposition: inline
Content-Length: 1215
Content-Transfer-Encoding: binary
Content-Type: text/x-diff

Modified files:

Index: src/crypto/external/bsd/openssh/dist/ssh-agent.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.2 src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.3
--- src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.2	Sun Jun  7 22:38:47 2009
+++ src/crypto/external/bsd/openssh/dist/ssh-agent.c	Thu Dec 17 15:55:16 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ssh-agent.c,v 1.2 2009/06/07 22:38:47 christos Exp $	*/
+/*	$NetBSD: ssh-agent.c,v 1.3 2009/12/17 15:55:16 agc Exp $	*/
 /* $OpenBSD: ssh-agent.c,v 1.159 2008/06/28 14:05:15 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-agent.c,v 1.2 2009/06/07 22:38:47 christos Exp $");
+__RCSID("$NetBSD: ssh-agent.c,v 1.3 2009/12/17 15:55:16 agc Exp $");
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/queue.h>
@@ -307,13 +307,13 @@
 	Buffer msg;
 	Key *key;
 
+	odatafellows = datafellows;
 	datafellows = 0;
 
 	blob = buffer_get_string(&e->request, &blen);
 	data = buffer_get_string(&e->request, &dlen);
 
 	flags = buffer_get_int(&e->request);
-	odatafellows = datafellows;
 	if (flags & SSH_AGENT_OLD_SIGNATURE)
 		datafellows = SSH_BUG_SIGBLOB;
 


--_----------=_126106531684090--
]