- pass -Wcast-qual to gcc

[citadel.git] / citadel / serv_pop3.c

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index a9d77be7197a0eaa95f572112843acccde9e39a8..92a02c12b23864b88e56e3583bd790ccef072cc2 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -1,21 +1,16 @@
 /*
  * $Id$ 
  *
- * POP3 server for the Citadel/UX system
- * Copyright (C) 1998-2000 by Art Cancro and others.
+ * POP3 service for the Citadel/UX system
+ * Copyright (C) 1998-2001 by Art Cancro and others.
  * This code is released under the terms of the GNU General Public License.
  *
  * Current status of standards conformance:
  *
  * -> All required POP3 commands described in RFC1939 are implemented.
- * 
- * -> Nearly all of the optional commands in RFC1939 are also implemented.
- *    The only one missing is APOP, because it implements a "shared secret"
- *    method  of authentication which would require some major changes to the
- *    Citadel server core.
- *
- *    This is no longer true- APOP is implemented.
  *
+ * -> All optional POP3 commands described in RFC1939 are also implemented.
+ * 
  * -> The deprecated "LAST" command is included in this implementation, because
  *    there exist mail clients which insist on using it (such as Bynari
  *    TradeMail, and certain versions of Eudora).
@@ -80,7 +75,10 @@ void pop3_cleanup_function(void) {
        lprintf(9, "Performing POP3 cleanup hook\n");
 
        if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
-               fclose(POP3->msgs[i].temp);
+               if (POP3->msgs[i].temp != NULL) {
+                       fclose(POP3->msgs[i].temp);
+                       POP3->msgs[i].temp = NULL;
+               }
        }
        if (POP3->msgs != NULL) phree(POP3->msgs);
 
@@ -240,7 +238,7 @@ void pop3_apop(char *argbuf)
        return;
    }
    
-   make_apop_string(CC->usersupp.password, CC->cs_nonce, realdigest);
+   make_apop_string(CC->usersupp.password, CC->cs_nonce, realdigest, sizeof realdigest);
    if (!strncasecmp(realdigest, userdigest, MD5_HEXSTRING_SIZE-1))
    {
        do_login();
@@ -452,7 +450,7 @@ void pop3_update(void) {
                lgetuser(&CC->usersupp, CC->curr_user);
 
                CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
-               sprintf(vbuf.v_seen, "*:%ld",
+               snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld",
                        POP3->msgs[POP3->num_msgs-1].msgnum);
                CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
 
@@ -547,7 +545,7 @@ void pop3_command_loop(void) {
                CC->kill_me = 1;
                return;
        }
-       lprintf(5, "citserver[%3d]: %s\r\n", CC->cs_pid, cmdbuf);
+       lprintf(5, "POP3: %s\r\n", cmdbuf);
        while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
 
        if (!strncasecmp(cmdbuf, "NOOP", 4)) {