Module Name: src
Committed By: christos
Date: Fri Oct 26 12:42:10 UTC 2012
Modified Files:
src/crypto/external/bsd/openssh/dist: ssh-agent.c
Log Message:
Don't forget to re-assign sock after dup2(); from Jarle Greipsland
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/ssh-agent.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.10 src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.11
--- src/crypto/external/bsd/openssh/dist/ssh-agent.c:1.10 Tue Sep 18 11:18:01 2012
+++ src/crypto/external/bsd/openssh/dist/ssh-agent.c Fri Oct 26 08:42:10 2012
@@ -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 <[email protected]>
@@ -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 @@ main(int ac, char **av)
cleanup_exit(1);
}
close(sock);
+ sock = STDERR_FILENO + 1;
}
#if defined(F_CLOSEM)
if (fcntl(sock + 1, F_CLOSEM, 0) == -1) {
