gpg: No need to create a trustdb when encrypting with --always-trust.
authorWerner Koch <wk@gnupg.org>
Fri, 2 Aug 2013 07:17:52 +0000 (09:17 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 2 Aug 2013 07:17:52 +0000 (09:17 +0200)
* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
--

(back ported from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)

Signed-off-by: Werner Koch <wk@gnupg.org>
g10/gpg.c

index 96f9086..b310308 100644 (file)
--- 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 )