diff options
| author | doug@openbsd.org <doug@openbsd.org> | 2015-12-11 18:41:37 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-12-18 04:50:49 +0100 |
| commit | 43849a47c5f8687699eafbcb5604f6b9c395179f (patch) | |
| tree | 6fcea4d7a9754131d038bb9f510780a2b08dc188 /ssh-agent.c | |
| parent | upstream commit (diff) | |
| download | openssh-43849a47c5f8687699eafbcb5604f6b9c395179f.tar.xz openssh-43849a47c5f8687699eafbcb5604f6b9c395179f.zip | |
upstream commit
Add "id" to ssh-agent pledge for subprocess support.
Found the hard way by Jan Johansson when using ssh-agent with X. Also,
rearranged proc/exec and retval to match other pledge calls in the tree.
ok djm@
Upstream-ID: 914255f6850e5e7fa830a2de6c38605333b584db
Diffstat (limited to 'ssh-agent.c')
| -rw-r--r-- | ssh-agent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 709c5b703..2048a11c4 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.210 2015/12/11 02:29:03 dtucker Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.211 2015/12/11 17:41:37 doug Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1415,7 +1415,7 @@ skip: signal(SIGTERM, cleanup_handler); nalloc = 0; - if (pledge("stdio cpath unix exec proc", NULL) != 0) + if (pledge("stdio cpath unix id proc exec", NULL) == -1) fatal("%s: pledge: %s", __progname, strerror(errno)); while (1) { |