diff options
| author | David Shaw <[email protected]> | 2003-08-24 23:01:26 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-24 23:01:26 +0000 |
| commit | 03c12b5a5b2e0f7f3226674acb182436d3b519ca (patch) | |
| tree | 134cc2aaf7779d4abf7c4df8d9227e430a5cd464 /g10/mainproc.c | |
| parent | * random.c (getfnc_gather_random): Don't check NAME_OF_DEV_RANDOM twice. (diff) | |
| download | gnupg-03c12b5a5b2e0f7f3226674acb182436d3b519ca.tar.gz gnupg-03c12b5a5b2e0f7f3226674acb182436d3b519ca.zip | |
* mainproc.c (check_sig_and_print): Get the uid validity before printing
any sig results to avoid munging the output with trustdb warnings.
* g10.c (main): Don't include --show-keyring in --help as it is
deprecated.
Diffstat (limited to '')
| -rw-r--r-- | g10/mainproc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index 8cb7b9825..1762497f8 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1329,6 +1329,7 @@ check_sig_and_print( CTX c, KBNODE node ) /* find and print the primary user ID */ for( un=keyblock; un; un = un->next ) { + int valid; if(un->pkt->pkttype==PKT_PUBLIC_KEY) { pk=un->pkt->pkt.public_key; @@ -1350,6 +1351,11 @@ check_sig_and_print( CTX c, KBNODE node ) assert(pk); + /* Get it before we print anything to avoid interrupting + the output with the "please do a --check-trustdb" + line. */ + valid=get_validity(pk,un->pkt->pkt.user_id); + keyid_str[17] = 0; /* cut off the "[uncertain]" part */ write_status_text_and_buffer (statno, keyid_str, un->pkt->pkt.user_id->name, @@ -1362,9 +1368,7 @@ check_sig_and_print( CTX c, KBNODE node ) print_utf8_string( log_stream(), un->pkt->pkt.user_id->name, un->pkt->pkt.user_id->len ); if(opt.verify_options&VERIFY_SHOW_VALIDITY) - fprintf(log_stream(),"\" [%s]\n", - trust_value_to_string(get_validity(pk, - un->pkt->pkt.user_id))); + fprintf(log_stream(),"\" [%s]\n",trust_value_to_string(valid)); else fputs("\"\n", log_stream() ); count++; |