diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /ssh-agent.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index dd7e22ad5..a69c25eec 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | #include "openbsd-compat/sys-queue.h" | 37 | #include "openbsd-compat/sys-queue.h" |
38 | RCSID("$OpenBSD: ssh-agent.c,v 1.122 2004/10/29 22:53:56 djm Exp $"); | 38 | RCSID("$OpenBSD: ssh-agent.c,v 1.124 2005/10/30 08:52:18 djm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | #include <openssl/md5.h> | 41 | #include <openssl/md5.h> |
@@ -355,7 +355,7 @@ process_remove_identity(SocketEntry *e, int version) | |||
355 | if (id != NULL) { | 355 | if (id != NULL) { |
356 | /* | 356 | /* |
357 | * We have this key. Free the old key. Since we | 357 | * We have this key. Free the old key. Since we |
358 | * don\'t want to leave empty slots in the middle of | 358 | * don't want to leave empty slots in the middle of |
359 | * the array, we actually free the key there and move | 359 | * the array, we actually free the key there and move |
360 | * all the entries between the empty slot and the end | 360 | * all the entries between the empty slot and the end |
361 | * of the array. | 361 | * of the array. |
@@ -1008,6 +1008,9 @@ main(int ac, char **av) | |||
1008 | pid_t pid; | 1008 | pid_t pid; |
1009 | char pidstrbuf[1 + 3 * sizeof pid]; | 1009 | char pidstrbuf[1 + 3 * sizeof pid]; |
1010 | 1010 | ||
1011 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | ||
1012 | sanitise_stdfd(); | ||
1013 | |||
1011 | /* drop */ | 1014 | /* drop */ |
1012 | setegid(getgid()); | 1015 | setegid(getgid()); |
1013 | setgid(getgid()); | 1016 | setgid(getgid()); |