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 @@
 
 #include "includes.h"
 #include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.122 2004/10/29 22:53:56 djm Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.124 2005/10/30 08:52:18 djm Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -355,7 +355,7 @@ process_remove_identity(SocketEntry *e, int version)
                 if (id != NULL) {
                         /*
                          * We have this key.  Free the old key.  Since we
-                         * don\'t want to leave empty slots in the middle of
+                         * don't want to leave empty slots in the middle of
                          * the array, we actually free the key there and move
                          * all the entries between the empty slot and the end
                          * of the array.
@@ -1008,6 +1008,9 @@ main(int ac, char **av)
         pid_t pid;
         char pidstrbuf[1 + 3 * sizeof pid];
 
+        /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
+        sanitise_stdfd();
+
         /* drop */
         setegid(getgid());
         setgid(getgid());