From MAILER-DAEMON Tue Aug 13 01:46:10 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1V97Qo-00085Q-4n
	for mharc-commit-mailutils@gnu.org; Tue, 13 Aug 2013 01:46:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39254)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1V97Qk-0007y7-CY
	for commit-mailutils@gnu.org; Tue, 13 Aug 2013 01:46:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1V97Qg-0000ey-Uh
	for commit-mailutils@gnu.org; Tue, 13 Aug 2013 01:46:06 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:39463)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1V97Qg-0000et-QQ
	for commit-mailutils@gnu.org; Tue, 13 Aug 2013 01:46:02 -0400
Received: from gray by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1V97Qg-0006NF-5E
	for commit-mailutils@gnu.org; Tue, 13 Aug 2013 05:46:02 +0000
Date: Tue, 13 Aug 2013 05:46:02 +0000
Message-Id: <E1V97Qg-0006NF-5E@vcs.savannah.gnu.org>
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
Subject: [SCM] GNU Mailutils branch, master, updated. release-2.2-659-g784c724
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3f63391c6ddb872bd6cb78662a24c5adade4a59c
X-Git-Newrev: 784c724ff46f564d4313c2a6d8197922959eb09d
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Aug 2013 05:46:08 -0000

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 <gray@gnu.org.ua>
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


From MAILER-DAEMON Thu Aug 22 00:20:51 2013
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1VCMOB-0006NH-Ng
	for mharc-commit-mailutils@gnu.org; Thu, 22 Aug 2013 00:20:51 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46564)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VCMO9-0006N5-BN
	for commit-mailutils@gnu.org; Thu, 22 Aug 2013 00:20:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VCMO7-00079a-J0
	for commit-mailutils@gnu.org; Thu, 22 Aug 2013 00:20:49 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54527)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VCMO7-00079Q-CP
	for commit-mailutils@gnu.org; Thu, 22 Aug 2013 00:20:47 -0400
Received: from gray by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1VCMO6-0003RP-9e
	for commit-mailutils@gnu.org; Thu, 22 Aug 2013 04:20:47 +0000
Date: Thu, 22 Aug 2013 04:20:46 +0000
Message-Id: <E1VCMO6-0003RP-9e@vcs.savannah.gnu.org>
From: "Sergey Poznyakoff" <gray@gnu.org.ua>
To: commit-mailutils@gnu.org
Subject: [SCM] GNU Mailutils branch, master, updated. release-2.2-660-gc80cac7
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 784c724ff46f564d4313c2a6d8197922959eb09d
X-Git-Newrev: c80cac74a8eb89f754d870d2032c04d1a86ea01f
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: commit-mailutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit notices for GNU mailutils <commit-mailutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-mailutils>
List-Post: <mailto:commit-mailutils@gnu.org>
List-Help: <mailto:commit-mailutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-mailutils>,
	<mailto:commit-mailutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Aug 2013 04:20:50 -0000

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=c80cac74a8eb89f754d870d2032c04d1a86ea01f

The branch, master has been updated
       via  c80cac74a8eb89f754d870d2032c04d1a86ea01f (commit)
      from  784c724ff46f564d4313c2a6d8197922959eb09d (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 c80cac74a8eb89f754d870d2032c04d1a86ea01f
Author: Sergey Poznyakoff <gray@gnu.org.ua>
Date:   Thu Aug 22 07:20:12 2013 +0300

    Fix tls_required functionality in imap4d
    
    * imap4d/imap4d.c (imap4d_mainloop): Add missing break.

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

Summary of changes:
 imap4d/imap4d.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 932e48d..532e114 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -586,6 +586,7 @@ imap4d_mainloop (int ifd, int ofd, enum tls_mode tls)
     {
     case tls_required:
       imap4d_capability_add (IMAP_CAPA_XTLSREQUIRED);
+      break;
     case tls_no:
       imap4d_capability_remove (IMAP_CAPA_STARTTLS);
       tls_available = 0;


hooks/post-receive
-- 
GNU Mailutils


