[SCM] GNU Mailutils branch, master, updated. release-2.2-659-g784c724

[Sergey Poznyakoff]

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 "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=784c724ff46f564d4313c2a6d8197922959eb09d

The branch, master has been updated
       via  784c724ff46f564d4313c2a6d8197922959eb09d (commit)
      from  3f63391c6ddb872bd6cb78662a24c5adade4a59c (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 784c724ff46f564d4313c2a6d8197922959eb09d
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Aug 13 08:45:24 2013 +0300

    Bugfix in LDAP code.
    
    * libmu_auth/ldap.c (_mu_conn_setup): Set protocol version
    number before trying to initialize TLS.  Provide a detailed
    diagnostics.

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

Summary of changes:
 libmu_auth/ldap.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/libmu_auth/ldap.c b/libmu_auth/ldap.c
index 2b7aff2..4b9f5d1 100644
--- a/libmu_auth/ldap.c
+++ b/libmu_auth/ldap.c
@@ -244,18 +244,28 @@ _mu_conn_setup (LDAP **pld)
     }
   free (ldapuri);
   
+  ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &protocol);
+
   if (ldap_param.tls)
     {
       rc = ldap_start_tls_s (ld, NULL, NULL);
       if (rc != LDAP_SUCCESS)
        {
+         char *msg = NULL;
+         ldap_get_option (ld,
+                          LDAP_OPT_DIAGNOSTIC_MESSAGE,
+                          (void*)&msg);
+         
          mu_error (_("ldap_start_tls failed: %s"), ldap_err2string (rc));
+         mu_error (_("TLS diagnostics: %s"), msg);
+         ldap_memfree (msg);
+
+         ldap_unbind_ext (ld, NULL, NULL);
+         
          return 1;
        }
     }
 
-  ldap_set_option (ld, LDAP_OPT_PROTOCOL_VERSION, &protocol);
-
   /* FIXME: Timeouts, SASL, etc. */
   *pld = ld;
   return 0;


hooks/post-receive
-- 
GNU Mailutils