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/tdbio.h | |
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/tdbio.h')
-rw-r--r-- | g10/tdbio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/tdbio.h b/g10/tdbio.h index 252a393b7..4f37de44e 100644 --- a/g10/tdbio.h +++ b/g10/tdbio.h @@ -93,7 +93,7 @@ typedef struct trust_record TRUSTREC; /*-- tdbio.c --*/ int tdbio_update_version_record(void); -int tdbio_set_dbname( const char *new_dbname, int create ); +int tdbio_set_dbname( const char *new_dbname, int create, int *r_nofile); const char *tdbio_get_dbname(void); void tdbio_dump_record( TRUSTREC *rec, FILE *fp ); int tdbio_read_record( ulong recnum, TRUSTREC *rec, int expected ); |