Update of /cvsroot/mahogany/M/lib/imap/src/c-client
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24326/src/c-client

Modified Files:
        smtp.c 
Log Message:
after imap-2004b.DEV.SNAP-0409021845 merge

Index: smtp.c
===================================================================
RCS file: /cvsroot/mahogany/M/lib/imap/src/c-client/smtp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- smtp.c      28 Apr 2004 22:45:54 -0000      1.3
+++ smtp.c      3 Sep 2004 14:08:34 -0000       1.4
@@ -11,5 +11,5 @@
  *
  * Date:       27 July 1988
- * Last Edited:        15 March 2004
+ * Last Edited:        6 July 2004
  * 
  * The IMAP toolkit provided in this Distribution is
@@ -46,4 +46,5 @@
 #define SMTPWANTAUTH (long) 505        /* SMTP authentication needed */
 #define SMTPWANTAUTH2 (long) 530/* SMTP authentication needed */
+#define SMTPUNAVAIL (long) 550 /* SMTP mailbox unavailable */
 #define SMTPHARDERROR (long) 554/* SMTP miscellaneous hard failure */
 
@@ -314,5 +315,8 @@
        if ((*at->client) (smtp_challenge,smtp_response,"smtp",mb,stream,
                           &trial,usr)) {
-         if (stream->replycode == SMTPAUTHED) ret = LONGT;
+         if (stream->replycode == SMTPAUTHED) {
+           ESMTP.auth = NIL;   /* disable authenticators */
+           ret = LONGT;
+         }
                                /* if main program requested cancellation */
          else if (!trial) mm_log ("SMTP Authentication cancelled",ERROR);
@@ -476,4 +480,5 @@
                                /* send "MAIL FROM" command */
     switch (smtp_send (stream,type,tmp)) {
+    case SMTPUNAVAIL:          /* mailbox unavailable? */
     case SMTPWANTAUTH:         /* wants authentication? */
     case SMTPWANTAUTH2:
@@ -567,4 +572,5 @@
        case SMTPOK:            /* looks good */
          break;
+       case SMTPUNAVAIL:       /* mailbox unavailable? */
        case SMTPWANTAUTH:      /* wants authentication? */
        case SMTPWANTAUTH2:



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to