diff options
author | Werner Koch <[email protected]> | 2013-10-11 07:25:58 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2014-03-07 09:44:27 +0000 |
commit | d8f0b83e4f04641e5e9adbdd8abada15380f981c (patch) | |
tree | 3f6cbf91c73ca9fec54874696675cd6fa55107cd /g10/gpg.c | |
parent | gpg: Print a "not found" message for an unknown key in --key-edit. (diff) | |
download | gnupg-d8f0b83e4f04641e5e9adbdd8abada15380f981c.tar.gz gnupg-d8f0b83e4f04641e5e9adbdd8abada15380f981c.zip |
gpg: Do not require a trustdb with --always-trust.
* g10/tdbio.c (tdbio_set_dbname): Add arg R_NOFILE.
* g10/trustdb.c (trustdb_args): Add field no_trustdb.
(init_trustdb): Set that field.
(revalidation_mark): Take care of a nonexistent trustdb file.
(read_trust_options): Ditto.
(tdb_get_ownertrust): Ditto.
(tdb_get_min_ownertrust): Ditto.
(tdb_update_ownertrust): Ditto.
(update_min_ownertrust): Ditto.
(tdb_clear_ownertrusts): Ditto.
(tdb_cache_disabled_value): Ditto.
(tdb_check_trustdb_stale): Ditto.
(tdb_get_validity_core): Ditto.
* g10/gpg.c (main): Do not create a trustdb with most commands for
trust-model always.
--
This slightly changes the semantics of most commands in that they
won't create a trustdb if --trust-model=always is used. It just does
not make sense to create a trustdb if there is no need for it.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit 1a0eeaacd1bf09fe5125dbc3f56016bc20f3512e)
Resolved conflicts:
NEWS
g10/trustdb.c: Manually apply changes due to changed
function names.
Note that this also includes the fix for clear_ownertrust, see
GnuPG-bug-id: 1622.
Diffstat (limited to 'g10/gpg.c')
-rw-r--r-- | g10/gpg.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -3539,15 +3539,11 @@ main (int argc, char **argv) case aListTrustDB: rc = setup_trustdb (argc? 1:0, trustdb_name); break; - case aEncr: - case aEncrFiles: + default: /* If we are using TM_ALWAYS, we do not need to create the trustdb. */ rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name); break; - default: - rc = setup_trustdb (1, trustdb_name ); - break; } if (rc) log_error (_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc)); |