diff options
| author | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
| commit | 7c07891caf91823c65d0ed7f700a1cfe983e15cc (patch) | |
| tree | fb276a713da5dc24fdafffe04d15c0de14e138e2 /crypto/openssh/ssh-agent.c | |
| parent | c2efe9a3053e865e5c7bf36de808ec154ddb8c36 (diff) | |
| download | FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.zip FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.tar.gz | |
Merge conflicts.
Diffstat (limited to 'crypto/openssh/ssh-agent.c')
| -rw-r--r-- | crypto/openssh/ssh-agent.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c index 99ec904..d23a8fa 100644 --- a/crypto/openssh/ssh-agent.c +++ b/crypto/openssh/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 $"); RCSID("$FreeBSD$"); #include <openssl/evp.h> @@ -356,7 +356,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. @@ -1009,6 +1009,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()); |
