[src/trunk]: src/crypto/external/bsd/openssh/dist Preserve the existing value...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/84b6edc04bed
branches:  trunk
changeset: 750122:84b6edc04bed
user:      agc <agc%NetBSD.org@localhost>
date:      Thu Dec 17 15:55:16 2009 +0000

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

diffstat:

 crypto/external/bsd/openssh/dist/ssh-agent.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 8f198bf7997c -r 84b6edc04bed crypto/external/bsd/openssh/dist/ssh-agent.c
--- a/crypto/external/bsd/openssh/dist/ssh-agent.c      Thu Dec 17 15:48:13 2009 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-agent.c      Thu Dec 17 15:55:16 2009 +0000
@@ -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@localhost>
@@ -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;