diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-01-04 03:21:43 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-01-04 03:23:04 +0100 |
| commit | b108ce92aae0ca0376dce9513d953be60e449ae1 (patch) | |
| tree | 0537bda0331241617aa5d5045881547f99f26ed4 /ssh-agent.c | |
| parent | upstream commit (diff) | |
| download | openssh-b108ce92aae0ca0376dce9513d953be60e449ae1.tar.xz openssh-b108ce92aae0ca0376dce9513d953be60e449ae1.zip | |
upstream commit
relax PKCS#11 whitelist a bit to allow libexec as well as
lib directories.
Upstream-ID: cf5617958e2e2d39f8285fd3bc63b557da484702
Diffstat (limited to '')
| -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 395213553..1320cdaa1 100644 --- a/ssh-agent.c +++ b/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 @@ -89,7 +89,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 { |