mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Changes to --min-cert-level should cause a trustdb rebuild (issue 1366)
* g10/gpgv.c, g10/trustdb.c (read_trust_options): Add min_cert_level * g10/trustdb.c (check_trustdb_stale): Request a rebuild if pending_check_trustdb is true (set when we detect a trustdb parameter has changed). * g10/keylist.c (public_key_list): Use 'l' in the "tru" with-colons listing for min_cert_level not matching. * g10/tdbio.c (tdbio_update_version_record, create_version_record, tdbio_db_matches_options, tdbio_dump_record, tdbio_read_record, tdbio_write_record): Add a byte for min_cert_level in the tdbio version record.
This commit is contained in:
parent
e97e2ced6c
commit
deee8147aa
6 changed files with 34 additions and 18 deletions
|
@ -1,6 +1,6 @@
|
|||
/* keylist.c - Print information about OpenPGP keys
|
||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
* 2008, 2010 Free Software Foundation, Inc.
|
||||
* 2008, 2010, 2012 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
|
@ -67,10 +67,10 @@ public_key_list (ctrl_t ctrl, strlist_t list, int locate_mode)
|
|||
if (opt.with_colons)
|
||||
{
|
||||
byte trust_model, marginals, completes, cert_depth;
|
||||
ulong created, nextcheck;
|
||||
ulong created, nextcheck, min_cert_level;
|
||||
|
||||
read_trust_options (&trust_model, &created, &nextcheck,
|
||||
&marginals, &completes, &cert_depth);
|
||||
&marginals, &completes, &cert_depth, &min_cert_level);
|
||||
|
||||
es_fprintf (es_stdout, "tru:");
|
||||
|
||||
|
@ -86,6 +86,8 @@ public_key_list (ctrl_t ctrl, strlist_t list, int locate_mode)
|
|||
es_fprintf (es_stdout, "c");
|
||||
if (cert_depth != opt.max_cert_depth)
|
||||
es_fprintf (es_stdout, "d");
|
||||
if (min_cert_level != opt.min_cert_level)
|
||||
es_fprintf (es_stdout, "l");
|
||||
}
|
||||
|
||||
es_fprintf (es_stdout, ":%d:%lu:%lu", trust_model, created, nextcheck);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue