[Pkg-gnupg-commit] [gnupg2] 105/292: g10: Correctly determine whether a binding has a conflict.

[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 6fdf37f0831949cb279de6dc6b247ab2ed53fe5a
Author: Neal H. Walfield <neal at g10code.com>
Date:   Wed Oct 12 21:39:12 2016 +0200

    g10: Correctly determine whether a binding has a conflict.
    
    * g10/tofu.c (build_conflict_set): A binding has a conflict is
    conflict is *not* NULL, not if it is NULL.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/tofu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index 97e7a6e..ce107de 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1793,7 +1793,7 @@ build_conflict_set (tofu_dbs_t dbs, const char *fingerprint, const char *email)
      "select"
      /* A binding should only appear once, but try not to break in the
       * case of corruption.  */
-     "  fingerprint || case sum(conflict ISNULL) when 0 then '' else '!' end"
+     "  fingerprint || case sum(conflict NOTNULL) when 0 then '' else '!' end"
      " from bindings where email = ?"
      "  group by fingerprint"
      /* Make sure the current key comes first in the result list (if

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