- stevesk@cvs.openbsd.org 2006/02/08 12:15:27

[openssh.git] / ssh-agent.c

diff --git a/ssh-agent.c b/ssh-agent.c
index dd7e22ad5ade39924351bd19f030e658f842309b..87381f09f1a1d583605c95dfea657c5e98d92b25 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,8 +35,11 @@
 
 #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.126 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
+#  include <paths.h>
+#endif
 #include <openssl/evp.h>
 #include <openssl/md5.h>
 
@@ -355,7 +358,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 +1011,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());