diff options
author | Werner Koch <wk@gnupg.org> | 2020-10-05 17:54:26 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2020-10-05 17:54:26 +0200 |
commit | 4eb9ce847825e8c6a07ce27d303c56233e85d007 (patch) | |
tree | 88be1b397d60e68bda1326f7a4797b6f82f2b9a2 | |
parent | b258f8de7e9fc436d72c4d4ff8f98e9b86d2f3f5 (diff) | |
download | gnupg-4eb9ce847825e8c6a07ce27d303c56233e85d007.tar.gz |
gpgsm: Fix detection of too old keyboxd.
* sm/keydb.c (warn_version_mismatch): Add arg ctrl and pass on.
(create_new_context): Pass ctrl to warn function.
-rw-r--r-- | sm/keydb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sm/keydb.c b/sm/keydb.c index 13eb1a407..e6b7a5b23 100644 --- a/sm/keydb.c +++ b/sm/keydb.c @@ -488,10 +488,11 @@ keydb_add_resource (ctrl_t ctrl, const char *url, int force, int *auto_created) /* Print a warning if the server's version number is less than our version number. Returns an error code on a connection problem. */ static gpg_error_t -warn_version_mismatch (assuan_context_t ctx, const char *servername) +warn_version_mismatch (ctrl_t ctrl, assuan_context_t ctx, + const char *servername) { return warn_server_version_mismatch (ctx, servername, 0, - gpgsm_status2, NULL, + gpgsm_status2, ctrl, !opt.quiet); } @@ -522,7 +523,7 @@ create_new_context (ctrl_t ctrl, assuan_context_t *r_ctx) log_info (_("no keyboxd running in this session\n")); } } - else if (!err && !(err = warn_version_mismatch (ctx, KEYBOXD_NAME))) + else if (!err && !(err = warn_version_mismatch (ctrl, ctx, KEYBOXD_NAME))) { /* Place to emit global options. */ } |