diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 12:53:35 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 23:56:52 +1100 |
commit | c7670b091a7174760d619ef6738b4f26b2093301 (patch) | |
tree | 2955001e5574431487f93bf70a9c2e6733bae619 /ssh-pkcs11-client.c | |
parent | 49d8c8e214d39acf752903566b105d06c565442a (diff) |
upstream: add "-v" flags to ssh-add and ssh-pkcs11-helper to turn up
debug verbosity.
Make ssh-agent turn on ssh-pkcs11-helper's verbosity when it is run
in debug mode ("ssh-agent -d"), so we get to see errors from the
PKCS#11 code.
ok markus@
OpenBSD-Commit-ID: 0a798643c6a92a508df6bd121253ba1c8bee659d
Diffstat (limited to 'ssh-pkcs11-client.c')
-rw-r--r-- | ssh-pkcs11-client.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c index 5ba33332a..e7860de89 100644 --- a/ssh-pkcs11-client.c +++ b/ssh-pkcs11-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-pkcs11-client.c,v 1.14 2019/01/20 22:57:45 djm Exp $ */ | 1 | /* $OpenBSD: ssh-pkcs11-client.c,v 1.15 2019/01/21 12:53:35 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2014 Pedro Martelletto. All rights reserved. | 4 | * Copyright (c) 2014 Pedro Martelletto. All rights reserved. |
@@ -49,8 +49,8 @@ | |||
49 | 49 | ||
50 | /* borrows code from sftp-server and ssh-agent */ | 50 | /* borrows code from sftp-server and ssh-agent */ |
51 | 51 | ||
52 | int fd = -1; | 52 | static int fd = -1; |
53 | pid_t pid = -1; | 53 | static pid_t pid = -1; |
54 | 54 | ||
55 | static void | 55 | static void |
56 | send_msg(struct sshbuf *m) | 56 | send_msg(struct sshbuf *m) |
@@ -272,7 +272,10 @@ static int | |||
272 | pkcs11_start_helper(void) | 272 | pkcs11_start_helper(void) |
273 | { | 273 | { |
274 | int pair[2]; | 274 | int pair[2]; |
275 | char *helper; | 275 | char *helper, *verbosity = NULL; |
276 | |||
277 | if (log_level_get() >= SYSLOG_LEVEL_DEBUG1) | ||
278 | verbosity = "-vvv"; | ||
276 | 279 | ||
277 | if (pkcs11_start_helper_methods() == -1) { | 280 | if (pkcs11_start_helper_methods() == -1) { |
278 | error("pkcs11_start_helper_methods failed"); | 281 | error("pkcs11_start_helper_methods failed"); |
@@ -297,7 +300,9 @@ pkcs11_start_helper(void) | |||
297 | helper = getenv("SSH_PKCS11_HELPER"); | 300 | helper = getenv("SSH_PKCS11_HELPER"); |
298 | if (helper == NULL || strlen(helper) == 0) | 301 | if (helper == NULL || strlen(helper) == 0) |
299 | helper = _PATH_SSH_PKCS11_HELPER; | 302 | helper = _PATH_SSH_PKCS11_HELPER; |
300 | execlp(helper, helper, (char *)NULL); | 303 | debug("%s: starting %s %s", __func__, helper, |
304 | verbosity == NULL ? "" : verbosity); | ||
305 | execlp(helper, helper, verbosity, (char *)NULL); | ||
301 | fprintf(stderr, "exec: %s: %s\n", helper, strerror(errno)); | 306 | fprintf(stderr, "exec: %s: %s\n", helper, strerror(errno)); |
302 | _exit(1); | 307 | _exit(1); |
303 | } | 308 | } |