From a1a59e6a539e597996976d0afb6aa3062e954188 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 2 Aug 2013 09:17:52 +0200 Subject: gpg: No need to create a trustdb when encrypting with --always-trust. * g10/gpg.c (main): Special case setup_trustdb for --encrypt. -- (back ported from commit 498b9a95dc65c43240835d64cc92d8fb43014d53) Signed-off-by: Werner Koch --- g10/gpg.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/g10/gpg.c b/g10/gpg.c index 96f908603..b310308eb 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -3318,6 +3318,12 @@ main (int argc, char **argv ) case aFixTrustDB: case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break; case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break; + case aEncr: + case aEncrFiles: + /* No need to create the trust model if we are using the + * always trust model. */ + rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name); + break; default: rc = setup_trustdb(1, trustdb_name ); break; } if( rc ) -- cgit v1.2.3