summaryrefslogtreecommitdiff
path: root/ssh-agent.c
diff options
context:
space:
mode:
authordoug@openbsd.org <doug@openbsd.org>2015-12-02 08:30:50 +0000
committerDamien Miller <djm@mindrot.org>2015-12-04 15:14:59 +1100
commitbcce47466bbc974636f588b5e4a9a18ae386f64a (patch)
tree675ed6678cb82e225d478baa5e37fdc7c72c938f /ssh-agent.c
parenta90d001543f46716b6590c6dcc681d5f5322f8cf (diff)
upstream commit
Add "cpath" to the ssh-agent pledge so the cleanup handler can unlink(). ok djm@ Upstream-ID: 9e632991d48241d56db645602d381253a3d8c29d
Diffstat (limited to 'ssh-agent.c')
-rw-r--r--ssh-agent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index 8a075cbb4..2a7ae88f9 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-agent.c,v 1.206 2015/12/02 08:00:58 djm Exp $ */ 1/* $OpenBSD: ssh-agent.c,v 1.207 2015/12/02 08:30:50 doug Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1402,7 +1402,7 @@ skip:
1402 signal(SIGTERM, cleanup_handler); 1402 signal(SIGTERM, cleanup_handler);
1403 nalloc = 0; 1403 nalloc = 0;
1404 1404
1405 if (pledge("stdio unix exec proc", NULL) != 0) 1405 if (pledge("stdio cpath unix exec proc", NULL) != 0)
1406 fatal("%s: pledge: %s", __progname, strerror(errno)); 1406 fatal("%s: pledge: %s", __progname, strerror(errno));
1407 1407
1408 while (1) { 1408 while (1) {