From cc383b6432f33b868597268b0b028c4f8b2bc307 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 20 May 2004 18:04:33 +0000 Subject: * options.h (ctrl): New for member IN_AUTO_KEY_RETRIEVE. * mainproc.c (check_sig_and_print): track whether we are retrieving a key. * status.c (status_currently_allowed): New. (write_status_text, write_status_text_and_buffer): Use it here. * g10.c: New command --gpgconf-list. (gpgconf_list): New. From Werner on stable branch. --- g10/mainproc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'g10/mainproc.c') diff --git a/g10/mainproc.c b/g10/mainproc.c index db15b0b5a..7c760b1a3 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1348,7 +1348,12 @@ check_sig_and_print( CTX c, KBNODE node ) if( rc == G10ERR_NO_PUBKEY && opt.keyserver && (opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE)) { - if( keyserver_import_keyid ( sig->keyid )==0 ) + int res; + + ctrl.in_auto_key_retrieve++; + res=keyserver_import_keyid ( sig->keyid ); + ctrl.in_auto_key_retrieve--; + if(!res) rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey ); } -- cgit