upstream commit

Add "cpath" to the ssh-agent pledge so the cleanup
 handler can unlink().

ok djm@

Upstream-ID: 9e632991d48241d56db645602d381253a3d8c29d

diff --git a/ssh-agent.c b/ssh-agent.c
index 8a075cbb4b6d1b655def27631f6ceff0da7ca212..2a7ae88f9649c84a11265d3298a3b4cac2b69ba7 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.206 2015/12/02 08:00:58 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.207 2015/12/02 08:30:50 doug Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1402,7 +1402,7 @@ skip:
        signal(SIGTERM, cleanup_handler);
        nalloc = 0;
 
-       if (pledge("stdio unix exec proc", NULL) != 0)
+       if (pledge("stdio cpath unix exec proc", NULL) != 0)
                fatal("%s: pledge: %s", __progname, strerror(errno));
 
        while (1) {