[Pkg-gnupg-commit] [gnupg2] 04/112: g10: Fix building without trust models.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit d21efa398874be4a15e8283c5fc382fb90f562fd
Author: Justus Winter <justus at g10code.com>
Date:   Fri Jul 15 12:12:34 2016 +0200

    g10: Fix building without trust models.
    
    * g10/pkclist.c (write_trust_status): Fall back to the previous
    behavior.
    
    Fixes-commit: ae188932
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 g10/pkclist.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/g10/pkclist.c b/g10/pkclist.c
index 6315a6d..63d32d1 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -508,6 +508,9 @@ do_we_trust_pre( PKT_public_key *pk, unsigned int trustlevel )
 static void
 write_trust_status (int statuscode, int trustlevel)
 {
+#ifdef NO_TRUST_MODELS
+  write_status (statuscode);
+#else /* NO_TRUST_MODELS */
   int tm;
 
   /* For the combined tofu+pgp method, we return the trust model which
@@ -517,6 +520,7 @@ write_trust_status (int statuscode, int trustlevel)
   else
     tm = opt.trust_model;
   write_status_strings (statuscode, "0 ", trust_model_string (tm), NULL);
+#endif /* NO_TRUST_MODELS */
 }
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git