* serv_pop3.c: Fixed APOP. Now logs in properly. Also cleaned up some non-

  RFC-compliant error messages.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 06b670c11009726eb2677d036428d8141ef850a7..4b49e6b866bc73890cb4c63c07fd12c9c5481415 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 573.119  2001/03/25 11:52:36  error
+ * serv_pop3.c: Fixed APOP. Now logs in properly. Also cleaned up some non-
+   RFC-compliant error messages.
+
  Revision 573.118  2001/03/21 05:47:49  ajc
  * Added the new IMAP mailbox string compare submitted by Daniel Malament.
 
@@ -2469,4 +2473,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import 
-

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index df53f197f155024a69150a95fb76afc091b9b8cf..b91800243c5cd735f4b49fb7cf5fb8b7b152c8ea 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -202,7 +202,7 @@ void pop3_apop(char *argbuf)
    
    if ((sptr = strchr(argbuf, ' ')) == NULL)
    {
-       cprintf("Invalid APOP line.\r\n");
+       cprintf("-ERR Invalid APOP line.\r\n");
        return;
    }
    
@@ -232,6 +232,7 @@ void pop3_apop(char *argbuf)
    make_apop_string(CC->usersupp.password, CC->cs_nonce, realdigest);
    if (!strncasecmp(realdigest, userdigest, MD5_HEXSTRING_SIZE-1))
    {
+       do_login();
        pop3_login();
    }
    else
@@ -598,7 +599,7 @@ void pop3_command_loop(void) {
        }
 
        else {
-               cprintf("500 I'm afraid I can't do that.\r\n");
+               cprintf("-ERR I'm afraid I can't do that.\r\n");
        }
 
 }