* trustdb.c (init_trustdb, get_validity): Don't use a changed trust model

to indicate a dirty trustdb, and never auto-rebuild a dirty trustdb with
the "always" trust model.

* g10.c (add_group): Last commit missed the \t ;)
This commit is contained in:
David Shaw 2003-01-15 17:07:54 +00:00
parent 06ef613289
commit b7ea66ef37
3 changed files with 13 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2003-01-15 David Shaw <dshaw@jabberwocky.com>
* trustdb.c (init_trustdb, get_validity): Don't use a changed
trust model to indicate a dirty trustdb, and never auto-rebuild a
dirty trustdb with the "always" trust model.
* g10.c (add_group): Last commit missed the \t ;)
2003-01-14 David Shaw <dshaw@jabberwocky.com>
* packet.h, parse-packet.c (setup_user_id), free-packet.c

View File

@ -859,7 +859,7 @@ static void add_group(char *string)
}
/* Break apart the values */
while ((value= strsep(&string," ")))
while ((value= strsep(&string," \t")))
{
if (*value)
add_to_strlist2 (&values,value,utf8_strings);

View File

@ -425,7 +425,8 @@ init_trustdb()
if( rc )
log_fatal("can't init trustdb: %s\n", g10_errstr(rc) );
if(!tdbio_db_matches_options())
if(!tdbio_db_matches_options()
&& (opt.trust_model==TM_CLASSIC || opt.trust_model==TM_OPENPGP))
pending_check_trustdb=1;
}
@ -971,7 +972,8 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid)
namehash_from_uid(uid);
init_trustdb ();
if (!did_nextcheck)
if (!did_nextcheck
&& (opt.trust_model==TM_CLASSIC || opt.trust_model==TM_OPENPGP))
{
ulong scheduled;