[Pkg-gnupg-commit] [gnupg2] 60/292: dirmngr: Fix STARTTLS on LDAP connections.

[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 9e6f8a55ed04f876635792125858ee76a948802a
Author: Justus Winter <justus at g10code.com>
Date:   Thu Sep 29 14:17:24 2016 +0200

    dirmngr: Fix STARTTLS on LDAP connections.
    
    * dirmngr/ks-engine-ldap.c (my_ldap_connect): Fix unfortunate typo.
    --
    Courtesy of pkgsrc contributor fhajny.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 dirmngr/ks-engine-ldap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dirmngr/ks-engine-ldap.c b/dirmngr/ks-engine-ldap.c
index ad2110e..9b9efc7 100644
--- a/dirmngr/ks-engine-ldap.c
+++ b/dirmngr/ks-engine-ldap.c
@@ -513,7 +513,7 @@ my_ldap_connect (parsed_uri_t uri, LDAP **ldap_connp,
 #endif /* LDAP_OPT_X_TLS_CACERTFILE && HAVE_LDAP_SET_OPTION */
 #endif
 
-#ifndef HAVE_LDAP_START_TLS_S
+#ifdef HAVE_LDAP_START_TLS_S
   if (uri->use_tls)
     {
       /* XXX: We need an option to determine whether to abort if the

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