From: Wilfried Goesgens <dothebart@uncensored.citadel.org>
Date: Tue, 29 Apr 2008 17:38:57 +0000 (-0700)
Subject: Print GSSAPI status messages to debug log on error.
X-Git-Tag: mutt-1-5-18-rel~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=027cb7f8889f3efe23a3726ed1503361f41a58b1;p=mutt

Print GSSAPI status messages to debug log on error.
---

diff --git a/ChangeLog b/ChangeLog
index 3e618f84..9ecb42f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-04-03 17:08 +0200  Miroslav Lichvar  <mlichvar@redhat.com>  (bdd44e92919d)
+
+	* mutt_ssl_gnutls.c: Fix sending long commands when using gnutls.
+
+2008-04-09 15:57 -0700  Dan Fandrich  <dan@coneharvesters.com>  (3b7b3c0e459e)
+
+	* configure.ac, strtok_r.c: Replace strtok_r when it's not
+	available. The implementation comes from glibc 2.6.1 (like the
+	strsep replacement) and uses the same autoconf hooks.
+
 2008-04-09 18:13 +0200  Christian Ebert  <blacktrash@gmx.net>  (ae90c8e8ea4d)
 
 	* doc/manual.xml.head: manual.xml.head: grammar correction
diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index d7a79ada..da7c22b6 100644
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -41,6 +41,42 @@
 #define GSS_AUTH_P_NONE      1
 #define GSS_AUTH_P_INTEGRITY 2
 #define GSS_AUTH_P_PRIVACY   4
+static void print_gss_error(OM_uint32 err_maj, OM_uint32 err_min)
+{
+	OM_uint32 maj_stat, min_stat; 
+	OM_uint32 msg_ctx = 0;
+	gss_buffer_desc status_string;
+	char buf_maj[512];
+	char buf_min[512];
+	
+	do
+	{
+		maj_stat = gss_display_status (&min_stat,
+					       err_maj,
+					       GSS_C_GSS_CODE,
+					       GSS_C_NO_OID,
+					       &msg_ctx,
+					       &status_string);
+		if (GSS_ERROR(maj_stat))
+			break;
+		strncpy(buf_maj, (char*) status_string.value, sizeof(buf_maj));
+		gss_release_buffer(&min_stat, &status_string);
+		
+		maj_stat = gss_display_status (&min_stat,
+					       err_min,
+					       GSS_C_MECH_CODE,
+					       GSS_C_NULL_OID,
+					       &msg_ctx,
+					       &status_string);
+		if (!GSS_ERROR(maj_stat))
+		{
+			strncpy(buf_min, (char*) status_string.value, sizeof(buf_min));
+			gss_release_buffer(&min_stat, &status_string);
+		}
+	} while (!GSS_ERROR(maj_stat) && msg_ctx != 0);
+	
+	dprint (2, (debugfile, "((%s:%d )(%s:%d))", buf_maj, err_maj, buf_min, err_min));
+}
 
 /* imap_auth_gss: AUTH=GSSAPI support. */
 imap_auth_res_t imap_auth_gss (IMAP_DATA* idata, const char* method)
@@ -95,6 +131,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA* idata, const char* method)
     (unsigned int*) &cflags, NULL);
   if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED)
   {
+    print_gss_error(maj_stat, min_stat);
     dprint (1, (debugfile, "Error acquiring credentials - no TGT?\n"));
     gss_release_name (&min_stat, &target_name);
 
@@ -151,6 +188,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA* idata, const char* method)
       (unsigned int*) &cflags, NULL);
     if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED)
     {
+      print_gss_error(maj_stat, min_stat);
       dprint (1, (debugfile, "Error exchanging credentials\n"));
       gss_release_name (&min_stat, &target_name);
 
@@ -182,6 +220,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA* idata, const char* method)
     &cflags, &quality);
   if (maj_stat != GSS_S_COMPLETE)
   {
+    print_gss_error(maj_stat, min_stat);
     dprint (2, (debugfile, "Couldn't unwrap security level data\n"));
     gss_release_buffer (&min_stat, &send_token);
     goto err_abort_cmd;