bugzilla 164

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index a7e70638883f661b8e4ee3dd2a75f2f349cea4f2..1182a8736a25e580c80df7a5e8fb11e576e4f109 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,9 @@
+Sat Oct  8 18:40:50 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
+* Replaced the various "socket is broken" messages with the message
+  "Client disconnected: ending session."  The previous messages were concerning
+  some site operators that there might have been something wrong with
+  the system.  (Bugzilla #164)
+
 Fri Oct  7 23:07:38 EDT 2005 Art Cancro <ajc@uncensored.citadel.org>
 * Makefile.in: change "CVS" references to ".svn" to avoid errors
   during install.

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 4e8e90143f3a456498832df8ea8710cddfb7935b..275a6c351d5d38fd6e9bbc68eafc5fc4bfe2e96c 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -913,7 +913,7 @@ void do_command_loop(void) {
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
        if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-               lprintf(CTDL_ERR, "Client socket is broken; ending session\n");
+               lprintf(CTDL_ERR, "Client disconnected: ending session.\n");
                CC->kill_me = 1;
                return;
        }

diff --git a/citadel/serv_imap.c b/citadel/serv_imap.c
index b81732a6885a8d8fd6b6087bc9f12ebc91eb6a81..67032bae7454a1ad9433b60558ecedf86e492bef 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -1378,7 +1378,7 @@ void imap_command_loop(void)
        memset(cmdbuf, 0, sizeof cmdbuf);       /* Clear it, just in case */
        flush_output();
        if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-               lprintf(CTDL_ERR, "IMAP socket is broken.  Ending session.\r\n");
+               lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
                CC->kill_me = 1;
                return;
        }

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index b79b3771fe2e9bf3ec70a627795c712c1661b73c..231e42025419ba618ef5654d439bd155ccc20e35 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -595,7 +595,7 @@ void pop3_command_loop(void) {
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
        if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-               lprintf(CTDL_ERR, "POP3 socket is broken.  Ending session.\r\n");
+               lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
                CC->kill_me = 1;
                return;
        }

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 313e2724760bba1c8afa7136c56260d470739783..00d5c6789e8f08522281fa5f902ae10b41a383a4 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -818,7 +818,7 @@ void smtp_command_loop(void) {
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
        if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-               lprintf(CTDL_CRIT, "SMTP socket is broken.  Ending session.\n");
+               lprintf(CTDL_CRIT, "Client disconnected: ending session.\n");
                CC->kill_me = 1;
                return;
        }

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 1179ea604fcee87a6c8a8f6ae77ee7fec0db7428..f9c4e1653bedbb8203c66687b6b833738f651a95 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -624,8 +624,7 @@ int client_read_to(char *buf, int bytes, int timeout)
 
                rlen = read(CC->client_socket, &buf[len], bytes-len);
                if (rlen<1) {
-                       lprintf(CTDL_ERR, "client_read() failed: %s\n",
-                               strerror(errno));
+                       /* The socket has been disconnected! */
                        CC->kill_me = 1;
                        return(-1);
                }