Rocco Rutte:

[apps/madmutt.git] / imap / auth_gss.c

diff --git a/imap/auth_gss.c b/imap/auth_gss.c
index 4602c47..bfe6c2f 100644 (file)
--- a/imap/auth_gss.c
+++ b/imap/auth_gss.c
@@ -18,6 +18,7 @@
 #include "auth.h"
 
 #include "lib/intl.h"
+#include "lib/debug.h"
 
 #include <netinet/in.h>
 
@@ -63,14 +64,14 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   maj_stat = gss_import_name (&min_stat, &request_buf, gss_nt_service_name,
                               &target_name);
   if (maj_stat != GSS_S_COMPLETE) {
-    dprint (2, (debugfile, "Couldn't get service name for [%s]\n", buf1));
+    debug_print (2, ("Couldn't get service name for [%s]\n", buf1));
     return IMAP_AUTH_UNAVAIL;
   }
 #ifdef DEBUG
   else if (debuglevel >= 2) {
     maj_stat = gss_display_name (&min_stat, target_name, &request_buf,
                                  &mech_name);
-    dprint (2, (debugfile, "Using service name [%s]\n",
+    debug_print (2, ("Using service name [%s]\n",
                 (char *) request_buf.value));
     maj_stat = gss_release_buffer (&min_stat, &request_buf);
   }
@@ -87,7 +88,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
                                    &send_token, (unsigned int *) &cflags,
                                    NULL);
   if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) {
-    dprint (1, (debugfile, "Error acquiring credentials - no TGT?\n"));
+    debug_print (1, ("Error acquiring credentials - no TGT?\n"));
     gss_release_name (&min_stat, &target_name);
 
     return IMAP_AUTH_UNAVAIL;
@@ -104,13 +105,13 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   while (rc == IMAP_CMD_CONTINUE);
 
   if (rc != IMAP_CMD_RESPOND) {
-    dprint (2, (debugfile, "Invalid response from server: %s\n", buf1));
+    debug_print (2, ("Invalid response from server: %s\n", buf1));
     gss_release_name (&min_stat, &target_name);
     goto bail;
   }
 
   /* now start the security context initialisation loop... */
-  dprint (2, (debugfile, "Sending credentials\n"));
+  debug_print (2, ("Sending credentials\n"));
   mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length,
                   sizeof (buf1) - 2);
   gss_release_buffer (&min_stat, &send_token);
@@ -124,7 +125,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
     while (rc == IMAP_CMD_CONTINUE);
 
     if (rc != IMAP_CMD_RESPOND) {
-      dprint (1, (debugfile, "Error receiving server response.\n"));
+      debug_print (1, ("Error receiving server response.\n"));
       gss_release_name (&min_stat, &target_name);
       goto bail;
     }
@@ -141,7 +142,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
                                      NULL, &send_token,
                                      (unsigned int *) &cflags, NULL);
     if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) {
-      dprint (1, (debugfile, "Error exchanging credentials\n"));
+      debug_print (1, ("Error exchanging credentials\n"));
       gss_release_name (&min_stat, &target_name);
 
       goto err_abort_cmd;
@@ -161,7 +162,7 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   while (rc == IMAP_CMD_CONTINUE);
 
   if (rc != IMAP_CMD_RESPOND) {
-    dprint (1, (debugfile, "Error receiving server response.\n"));
+    debug_print (1, ("Error receiving server response.\n"));
     goto bail;
   }
   request_buf.length = mutt_from_base64 (buf2, idata->cmd.buf + 2);
@@ -170,16 +171,16 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   maj_stat = gss_unwrap (&min_stat, context, &request_buf, &send_token,
                          &cflags, &quality);
   if (maj_stat != GSS_S_COMPLETE) {
-    dprint (2, (debugfile, "Couldn't unwrap security level data\n"));
+    debug_print (2, ("Couldn't unwrap security level data\n"));
     gss_release_buffer (&min_stat, &send_token);
     goto err_abort_cmd;
   }
-  dprint (2, (debugfile, "Credential exchange complete\n"));
+  debug_print (2, ("Credential exchange complete\n"));
 
   /* first octet is security levels supported. We want NONE */
   server_conf_flags = ((char *) send_token.value)[0];
   if (!(((char *) send_token.value)[0] & GSS_AUTH_P_NONE)) {
-    dprint (2, (debugfile, "Server requires integrity or privacy\n"));
+    debug_print (2, ("Server requires integrity or privacy\n"));
     gss_release_buffer (&min_stat, &send_token);
     goto err_abort_cmd;
   }
@@ -188,11 +189,11 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   ((char *) send_token.value)[0] = 0;
   buf_size = ntohl (*((long *) send_token.value));
   gss_release_buffer (&min_stat, &send_token);
-  dprint (2, (debugfile, "Unwrapped security level flags: %c%c%c\n",
+  debug_print (2, ("Unwrapped security level flags: %c%c%c\n",
               server_conf_flags & GSS_AUTH_P_NONE ? 'N' : '-',
               server_conf_flags & GSS_AUTH_P_INTEGRITY ? 'I' : '-',
               server_conf_flags & GSS_AUTH_P_PRIVACY ? 'P' : '-'));
-  dprint (2, (debugfile, "Maximum GSS token size is %ld\n", buf_size));
+  debug_print (2, ("Maximum GSS token size is %ld\n", buf_size));
 
   /* agree to terms (hack!) */
   buf_size = htonl (buf_size);  /* not relevant without integrity/privacy */
@@ -205,14 +206,13 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
   maj_stat = gss_wrap (&min_stat, context, 0, GSS_C_QOP_DEFAULT, &request_buf,
                        &cflags, &send_token);
   if (maj_stat != GSS_S_COMPLETE) {
-    dprint (2, (debugfile, "Error creating login request\n"));
+    debug_print (2, ("Error creating login request\n"));
     goto err_abort_cmd;
   }
 
   mutt_to_base64 ((unsigned char *) buf1, send_token.value, send_token.length,
                   sizeof (buf1) - 2);
-  dprint (2, (debugfile, "Requesting authorisation as %s\n",
-              idata->conn->account.user));
+  debug_print (2, ("Requesting authorisation as %s\n", idata->conn->account.user));
   safe_strcat (buf1, sizeof (buf1), "\r\n");
   mutt_socket_write (idata->conn, buf1);
 
@@ -221,15 +221,15 @@ imap_auth_res_t imap_auth_gss (IMAP_DATA * idata, const char *method)
     rc = imap_cmd_step (idata);
   while (rc == IMAP_CMD_CONTINUE);
   if (rc == IMAP_CMD_RESPOND) {
-    dprint (1, (debugfile, "Unexpected server continuation request.\n"));
+    debug_print (1, ("Unexpected server continuation request.\n"));
     goto err_abort_cmd;
   }
   if (imap_code (idata->cmd.buf)) {
     /* flush the security context */
-    dprint (2, (debugfile, "Releasing GSS credentials\n"));
+    debug_print (2, ("Releasing GSS credentials\n"));
     maj_stat = gss_delete_sec_context (&min_stat, &context, &send_token);
     if (maj_stat != GSS_S_COMPLETE)
-      dprint (1, (debugfile, "Error releasing credentials\n"));
+      debug_print (1, ("Error releasing credentials\n"));
 
     /* send_token may contain a notification to the server to flush
      * credentials. RFC 1731 doesn't specify what to do, and since this