[agc at NetBSD.org: CVS commit: src/crypto/external/bsd/openssh/dist]

[Alistair Crooks]

Hi,

I applied the following minor diff to preserve the value of the extern
variable across calls to process_sign_request2() in ssh-agent.c.

I've no idea if the attachment of the attachment will come out
correctly so a cvs diff is also attached.

Regards,
Alistair
-------------- next part --------------
An embedded message was scrubbed...
From: "Alistair G. Crooks" <agc at NetBSD.org>
Subject: CVS commit: src/crypto/external/bsd/openssh/dist
Date: Thu, 17 Dec 2009 15:55:16 +0000
Size: 3593
URL: <http://lists.mindrot.org/pipermail/openssh-unix-dev/attachments/20091218/77652611/attachment.mht>
-------------- next part --------------
Index: ssh-agent.c
===================================================================
RCS file: /cvsroot/src/crypto/external/bsd/openssh/dist/ssh-agent.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ssh-agent.c	7 Jun 2009 22:38:47 -0000	1.2
+++ ssh-agent.c	17 Dec 2009 15:55:16 -0000	1.3
@@ -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 at 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;