diff options
author | Werner Koch <[email protected]> | 2020-01-13 11:08:23 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2020-01-13 11:12:57 +0000 |
commit | 0e48aa084921c77944d4802c86ac33c607c519af (patch) | |
tree | 5ae8ebd9dfef337b4d1a2b4664a1699a6db6664e /tools/card-call-scd.c | |
parent | agent: handle SSH operation by KEYGRIP. (diff) | |
download | gnupg-0e48aa084921c77944d4802c86ac33c607c519af.tar.gz gnupg-0e48aa084921c77944d4802c86ac33c607c519af.zip |
scd: Make SERIALNO --all work correctly and use it.
* scd/app.c (maybe_switch_app): Factor reselect code out to ...
(run_reselect): new.
(app_write_learn_status): Tweak diagnostics.
(app_do_with_keygrip): Run reselect if a card has more than one
switchable application.
* agent/call-scd.c (agent_card_serialno): Ditto.
* tools/card-call-scd.c (start_agent): Use option --all with SERIALNO.
(scd_serialno): Ditto.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tools/card-call-scd.c')
-rw-r--r-- | tools/card-call-scd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/card-call-scd.c b/tools/card-call-scd.c index c2580bf5c..e4fa6abd3 100644 --- a/tools/card-call-scd.c +++ b/tools/card-call-scd.c @@ -360,7 +360,7 @@ start_agent (unsigned int flags) err = warn_version_mismatch (agent_ctx, SCDAEMON_NAME, 2); if (!err) - err = assuan_transact (agent_ctx, "SCD SERIALNO", + err = assuan_transact (agent_ctx, "SCD SERIALNO --all", NULL, NULL, NULL, NULL, learn_status_cb, &info); if (err && !(flags & START_AGENT_SUPPRESS_ERRORS)) @@ -1284,7 +1284,7 @@ scd_serialno (char **r_serialno, const char *demand) return err; if (!demand) - strcpy (line, "SCD SERIALNO"); + strcpy (line, "SCD SERIALNO --all"); else snprintf (line, DIM(line), "SCD SERIALNO --demand=%s", demand); |