[git] GnuPG - branch, master, updated. gnupg-2.1.1-26-g22b15fc

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  22b15fccffe613f455f9748c048c8e451724a842 (commit)
      from  602f17b5a775f02e0e33a54d3155929dc00e4f53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22b15fccffe613f455f9748c048c8e451724a842
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Jan 7 16:56:43 2015 +0900

    dirmngr: fix LDAP query PATTERNS limit check.
    
    * dirmngr/ldap.c (start_cert_fetch_ldap): fix ARGC limitation.
    
    --
    
    Reported-by: Joshua Rogers <honey at internot.info>
    
    Debian-Bug-Id: 773507

diff --git a/dirmngr/ldap.c b/dirmngr/ldap.c
index 478fdfd..00df167 100644
--- a/dirmngr/ldap.c
+++ b/dirmngr/ldap.c
@@ -588,7 +588,7 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *context,
       strlist_t sl;
       char *url;
 
-      if (argc >= sizeof argv -1)
+      if (argc >= DIM (argv) - 1)
         {
           /* Too many patterns.  It does not make sense to allow an
              arbitrary number of patters because the length of the

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/ldap.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org