* Fixed some SMTP bugs

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 5cfa5fa8301fc94f57644fcd4b9989c1679a7e48..687ccd0e482f862f6c4a6f5768e2b3f0777e2dc6 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -1,4 +1,7 @@
 /* $Id$ */
+
+#define SMTP_PORT      2525
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -138,7 +141,7 @@ void smtp_auth(char *argbuf) {
        char buf[256];
 
        if (strncasecmp(argbuf, "login", 5) ) {
-               cprintf("500 We only support LOGIN authentication.\n");
+               cprintf("550 We only support LOGIN authentication.\n");
                return;
        }
 
@@ -324,7 +327,7 @@ void smtp_command_loop(void) {
 char *Dynamic_Module_Init(void)
 {
        SYM_SMTP = CtdlGetDynamicSymbol();
-       CtdlRegisterServiceHook(25,
+       CtdlRegisterServiceHook(SMTP_PORT,
                                smtp_greeting,
                                smtp_command_loop);
        return "$Id$";

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 63b89bebf4680dea07d76ec05fea4d80a0c64a47..add4867fece4e2558cb8aafbd098abf0bbe83364 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -987,7 +987,7 @@ SETUP_FD:   memcpy(&readfds, &masterfds, sizeof(fd_set) );
                 * thread that the &readfds needs to be refreshed with more
                 * current data.
                 */
-               if (FD_ISSET(rescan[0], &readfds)) {
+               if (!time_to_die) if (FD_ISSET(rescan[0], &readfds)) {
                        read(rescan[0], &junk, 1);
                        goto SETUP_FD;
                }