summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-agent.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2017-01-04 02:21:43 +0000
committerdjm <djm@openbsd.org>2017-01-04 02:21:43 +0000
commit582ea5aed1a077bd03363a2fc9d1c7b447e5139e (patch)
tree994ebbc9f040a9828772d9ae9ea3d8227464643a /usr.bin/ssh/ssh-agent.c
parentsync (diff)
downloadwireguard-openbsd-582ea5aed1a077bd03363a2fc9d1c7b447e5139e.tar.xz
wireguard-openbsd-582ea5aed1a077bd03363a2fc9d1c7b447e5139e.zip
relax PKCS#11 whitelist a bit to allow libexec as well as lib
directories.
Diffstat (limited to 'usr.bin/ssh/ssh-agent.c')
-rw-r--r--usr.bin/ssh/ssh-agent.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 4a91f36d3ff..f90bd9d9d22 100644
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.215 2016/11/30 03:07:37 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.216 2017/01/04 02:21:43 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -76,7 +76,7 @@
#endif
#ifndef DEFAULT_PKCS11_WHITELIST
-# define DEFAULT_PKCS11_WHITELIST "/usr/lib/*,/usr/local/lib/*"
+# define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*"
#endif
typedef enum {