diff options
| author | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
| commit | e5d801b2d6aab34943ecb74550a852aa69c82f38 (patch) | |
| tree | 052572b83faf3cab81bed572534efc6912debcbf /crypto/openssh/ssh-agent.c | |
| parent | efa35724649769e9a081ef6970590dd0b0a97370 (diff) | |
| download | FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.zip FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/ssh-agent.c')
| -rw-r--r-- | crypto/openssh/ssh-agent.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/openssh/ssh-agent.c b/crypto/openssh/ssh-agent.c index f7fe0cd..29aa7dd 100644 --- a/crypto/openssh/ssh-agent.c +++ b/crypto/openssh/ssh-agent.c @@ -58,6 +58,10 @@ RCSID("$FreeBSD$"); #include "scard.h" #endif +#if defined(HAVE_SYS_PRCTL_H) +#include <sys/prctl.h> /* For prctl() and PR_SET_DUMPABLE */ +#endif + typedef enum { AUTH_UNUSED, AUTH_SOCKET, @@ -1025,6 +1029,11 @@ main(int ac, char **av) setgid(getgid()); setuid(geteuid()); +#if defined(HAVE_PRCTL) && defined(PR_SET_DUMPABLE) + /* Disable ptrace on Linux without sgid bit */ + prctl(PR_SET_DUMPABLE, 0); +#endif + SSLeay_add_all_algorithms(); __progname = ssh_get_progname(av[0]); |
