1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +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:
David Shaw 2012-01-19 22:33:51 -05:00
parent cb8ebf792e
commit f310735975
6 changed files with 31 additions and 16 deletions

View file

@ -1,6 +1,6 @@
/* keylist.c
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
* 2008 Free Software Foundation, Inc.
* 2008, 2012 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -60,11 +60,11 @@ public_key_list( STRLIST list )
{
if(opt.with_colons)
{
byte trust_model,marginals,completes,cert_depth;
byte trust_model,marginals,completes,cert_depth,min_cert_level;
ulong created,nextcheck;
read_trust_options(&trust_model,&created,&nextcheck,
&marginals,&completes,&cert_depth);
&marginals,&completes,&cert_depth,&min_cert_level);
printf("tru:");
@ -80,6 +80,8 @@ public_key_list( STRLIST list )
printf("c");
if(cert_depth!=opt.max_cert_depth)
printf("d");
if(min_cert_level!=opt.min_cert_level)
printf("l");
}
printf(":%d:%lu:%lu",trust_model,created,nextcheck);