From 9cfaaf59cea0ec2b999487d7c621dd022079d3ae Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Mon, 3 Dec 2001 02:57:53 +0000
Subject: [PATCH] * quick fix

---
 citadel/msgbase.c   |  4 ++--
 citadel/serv_pop3.c | 18 ++++++++----------
 citadel/server.h    |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 2f90bb9ee..11923c4f7 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2145,7 +2145,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf) {
 }
 
 
-#define NYI_FIXME
+#ifdef NOT_YET_FINISHED /* FIXME */
 /*
  * Validate recipients, count delivery types and errors, and handle aliasing
  */
@@ -2208,7 +2208,7 @@ struct recptypes *validate_recipients(char *recipients) {
 
 	return(ret);
 }
-#endif NYI_FIXME
+#endif /* FIXME */
 
 
 
diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index a9d77be71..08350c505 100644
--- 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);
 
diff --git a/citadel/server.h b/citadel/server.h
index cf2dc329a..4b24b9e64 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -3,7 +3,7 @@
 /* Uncomment this if you want to track memory leaks.
  * This incurs some overhead, so don't use it unless you're debugging the code!
  */
-/* #define DEBUG_MEMORY_LEAKS */
+#define DEBUG_MEMORY_LEAKS
 
 /*
  * New format for a message in memory
-- 
2.39.2