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

diff --git a/ssh-agent.c b/ssh-agent.c
index 709c5b70367b4957f42dedcddd1a37b7becc5153..2048a11c41d7a6875c33afa8d9efa1be0e5274d1 100644 (file)
--- 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) {