rationalize list handling in mutt a bit.

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

diff --git a/imap/auth_anon.c b/imap/auth_anon.c
index 252a3d0..7c2dfba 100644 (file)
--- a/imap/auth_anon.c
+++ b/imap/auth_anon.c
@@ -1,29 +1,27 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1999-2000 Brendan Cully <brendan@kublai.com>
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- */ 
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
 
 /* IMAP login/authentication code */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mutt.h"
 #include "imap_private.h"
 #include "auth.h"
 
+#include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
 /* this is basically a stripped-down version of the cram-md5 method. */
-imap_auth_res_t imap_auth_anon (IMAP_DATA* idata, const char* method)
+imap_auth_res_t imap_auth_anon (IMAP_DATA * idata, const char *method)
 {
   int rc;
 
@@ -44,28 +42,26 @@ imap_auth_res_t imap_auth_anon (IMAP_DATA* idata, const char* method)
     rc = imap_cmd_step (idata);
   while (rc == IMAP_CMD_CONTINUE);
 
-  if (rc != IMAP_CMD_RESPOND)
-  {
-    dprint (1, (debugfile, "Invalid response from server.\n"));
+  if (rc != IMAP_CMD_RESPOND) {
+    debug_print (1, ("Invalid response from server.\n"));
     goto bail;
   }
 
-  mutt_socket_write (idata->conn, "ZHVtbXkK\r\n"); /* base64 ("dummy") */
+  mutt_socket_write (idata->conn, "ZHVtbXkK\r\n");      /* base64 ("dummy") */
 
   do
     rc = imap_cmd_step (idata);
   while (rc == IMAP_CMD_CONTINUE);
-  
-  if (rc != IMAP_CMD_OK)
-  {
-    dprint (1, (debugfile, "Error receiving server response.\n"));
+
+  if (rc != IMAP_CMD_OK) {
+    debug_print (1, ("Error receiving server response.\n"));
     goto bail;
   }
 
   if (imap_code (idata->cmd.buf))
     return IMAP_AUTH_SUCCESS;
 
- bail:
+bail:
   mutt_error _("Anonymous authentication failed.");
   mutt_sleep (2);
   return IMAP_AUTH_FAILURE;