g10: Remove option --always-trust if compiled without trust models.
authorJustus Winter <justus@g10code.com>
Fri, 1 Apr 2016 12:51:56 +0000 (14:51 +0200)
committerJustus Winter <justus@g10code.com>
Fri, 1 Apr 2016 12:57:27 +0000 (14:57 +0200)
* g10/gpg.c (opts): Remove option --always-trust if compiled without
trust models.

Signed-off-by: Justus Winter <justus@g10code.com>
g10/gpg.c

index 330d5a3..b9d69a7 100644 (file)
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -681,7 +681,9 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oSkipHiddenRecipients, "skip-hidden-recipients", "@"),
   ARGPARSE_s_n (oNoSkipHiddenRecipients, "no-skip-hidden-recipients", "@"),
   ARGPARSE_s_i (oDefCertLevel, "default-cert-check-level", "@"), /* old */
+#ifndef NO_TRUST_MODELS
   ARGPARSE_s_n (oAlwaysTrust, "always-trust", "@"),
+#endif
   ARGPARSE_s_s (oTrustModel, "trust-model", "@"),
   ARGPARSE_s_s (oTOFUDefaultPolicy, "tofu-default-policy", "@"),
   ARGPARSE_s_s (oTOFUDBFormat, "tofu-db-format", "@"),