diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-01-04 02:21:43 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-01-04 13:23:04 +1100 |
| commit | b108ce92aae0ca0376dce9513d953be60e449ae1 (patch) | |
| tree | 0537bda0331241617aa5d5045881547f99f26ed4 /ssh-agent.c | |
| parent | c7995f296b9222df2846f56ecf61e5ae13d7a53d (diff) | |
upstream commit
relax PKCS#11 whitelist a bit to allow libexec as well as
lib directories.
Upstream-ID: cf5617958e2e2d39f8285fd3bc63b557da484702
Diffstat (limited to 'ssh-agent.c')
| -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 @@ | |||
| 1 | /* $OpenBSD: ssh-agent.c,v 1.215 2016/11/30 03:07:37 djm Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.216 2017/01/04 02:21:43 djm 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 |
| @@ -89,7 +89,7 @@ | |||
| 89 | #endif | 89 | #endif |
| 90 | 90 | ||
| 91 | #ifndef DEFAULT_PKCS11_WHITELIST | 91 | #ifndef DEFAULT_PKCS11_WHITELIST |
| 92 | # define DEFAULT_PKCS11_WHITELIST "/usr/lib/*,/usr/local/lib/*" | 92 | # define DEFAULT_PKCS11_WHITELIST "/usr/lib*/*,/usr/local/lib*/*" |
| 93 | #endif | 93 | #endif |
| 94 | 94 | ||
| 95 | typedef enum { | 95 | typedef enum { |