diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-07-05 23:59:45 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2020-07-15 15:07:42 +1000 |
commit | 6d755706a0059eb9e2d63517f288b75cbc3b4701 (patch) | |
tree | adb003b1adcea270f4480baa4ff83d495b3478f3 /ssh-agent.c | |
parent | b0c1e8384d5e136ebdf895d1434aea7dd8661a1c (diff) |
upstream: some language improvements; ok markus
OpenBSD-Commit-ID: 939d787d571b4d5da50b3b721fd0b2ac236acaa8
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 06efe3c6f..5f7ac8b91 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.261 2020/06/22 06:37:38 jmc Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.262 2020/07/05 23:59:45 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 |
@@ -93,8 +93,8 @@ | |||
93 | #include "ssh-pkcs11.h" | 93 | #include "ssh-pkcs11.h" |
94 | #include "sk-api.h" | 94 | #include "sk-api.h" |
95 | 95 | ||
96 | #ifndef DEFAULT_PROVIDER_WHITELIST | 96 | #ifndef DEFAULT_ALLOWED_PROVIDERS |
97 | # define DEFAULT_PROVIDER_WHITELIST "/usr/lib*/*,/usr/local/lib*/*" | 97 | # define DEFAULT_ALLOWED_PROVIDERS "/usr/lib*/*,/usr/local/lib*/*" |
98 | #endif | 98 | #endif |
99 | 99 | ||
100 | /* Maximum accepted message length */ | 100 | /* Maximum accepted message length */ |
@@ -1359,7 +1359,7 @@ main(int ac, char **av) | |||
1359 | usage(); | 1359 | usage(); |
1360 | 1360 | ||
1361 | if (allowed_providers == NULL) | 1361 | if (allowed_providers == NULL) |
1362 | allowed_providers = xstrdup(DEFAULT_PROVIDER_WHITELIST); | 1362 | allowed_providers = xstrdup(DEFAULT_ALLOWED_PROVIDERS); |
1363 | 1363 | ||
1364 | if (ac == 0 && !c_flag && !s_flag) { | 1364 | if (ac == 0 && !c_flag && !s_flag) { |
1365 | shell = getenv("SHELL"); | 1365 | shell = getenv("SHELL"); |