diff options
| author | David Shaw <[email protected]> | 2003-01-15 17:07:54 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-01-15 17:07:54 +0000 |
| commit | b7ea66ef37f4f91c48e1d3c09494ec3d84a87517 (patch) | |
| tree | 0d6d63c73904e96705c9301d9a444ed9bf5cb883 /g10/trustdb.c | |
| parent | * gpg.sgml: Minor language tweaks, spell check, copyright date, (diff) | |
| download | gnupg-b7ea66ef37f4f91c48e1d3c09494ec3d84a87517.tar.gz gnupg-b7ea66ef37f4f91c48e1d3c09494ec3d84a87517.zip | |
* 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 ;)
Diffstat (limited to '')
| -rw-r--r-- | g10/trustdb.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; |