aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-04-01 12:51:56 +0000
committerJustus Winter <[email protected]>2016-04-01 12:57:27 +0000
commitb74185b6eaeaae4754726ff203e11977777f568c (patch)
treed29be00a6fea62b7f0406b1f2cd07fdc6aeac6b4
parentspeedo,w32: Build libsqlite3. (diff)
downloadgnupg-b74185b6eaeaae4754726ff203e11977777f568c.tar.gz
gnupg-b74185b6eaeaae4754726ff203e11977777f568c.zip
g10: Remove option --always-trust if compiled without trust models.
* g10/gpg.c (opts): Remove option --always-trust if compiled without trust models. Signed-off-by: Justus Winter <[email protected]>
-rw-r--r--g10/gpg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/gpg.c b/g10/gpg.c
index 330d5a3fa..b9d69a7cb 100644
--- 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", "@"),