[src/trunk]: src/crypto/external/bsd/openssh/dist Don't forget to re-assign s...

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

details:   https://anonhg.NetBSD.org/src/rev/489818c17cee
branches:  trunk
changeset: 782290:489818c17cee
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 26 12:42:10 2012 +0000

description:
Don't forget to re-assign sock after dup2(); from Jarle Greipsland

diffstat:

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

diffs (26 lines):

diff -r e1688e344ff1 -r 489818c17cee crypto/external/bsd/openssh/dist/ssh-agent.c
--- a/crypto/external/bsd/openssh/dist/ssh-agent.c      Fri Oct 26 11:43:43 2012 +0000
+++ b/crypto/external/bsd/openssh/dist/ssh-agent.c      Fri Oct 26 12:42:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ssh-agent.c,v 1.10 2012/09/18 15:18:01 christos Exp $  */
+/*     $NetBSD: ssh-agent.c,v 1.11 2012/10/26 12:42:10 christos Exp $  */
 /* $OpenBSD: ssh-agent.c,v 1.172 2011/06/03 01:37:40 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -36,7 +36,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: ssh-agent.c,v 1.10 2012/09/18 15:18:01 christos Exp $");
+__RCSID("$NetBSD: ssh-agent.c,v 1.11 2012/10/26 12:42:10 christos Exp $");
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/queue.h>
@@ -1322,6 +1322,7 @@
                        cleanup_exit(1);
                }
                close(sock);
+               sock = STDERR_FILENO + 1;
        }
 #if defined(F_CLOSEM)
        if (fcntl(sock + 1, F_CLOSEM, 0) == -1) {