diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/g10.c | 2 | ||||
| -rw-r--r-- | g10/trustdb.c | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index af41543ec..d10d8f385 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2003-01-15 David Shaw <[email protected]> + + * 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 <[email protected]> * packet.h, parse-packet.c (setup_user_id), free-packet.c @@ -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); diff --git a/g10/trustdb.c b/g10/trustdb.c index e0e29f1d9..7f38bbc86 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -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; |