From 18da598d894ac1698038a278d919fa4301dd8d47 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sat, 8 Oct 2005 22:42:44 +0000 Subject: [PATCH] bugzilla 164 --- citadel/ChangeLog | 6 ++++++ citadel/citserver.c | 2 +- citadel/serv_imap.c | 2 +- citadel/serv_pop3.c | 2 +- citadel/serv_smtp.c | 2 +- citadel/sysdep.c | 3 +-- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/citadel/ChangeLog b/citadel/ChangeLog index a7e706388..1182a8736 100644 --- a/citadel/ChangeLog +++ b/citadel/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 8 18:40:50 EDT 2005 Art Cancro +* 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 * Makefile.in: change "CVS" references to ".svn" to avoid errors during install. diff --git a/citadel/citserver.c b/citadel/citserver.c index 4e8e90143..275a6c351 100644 --- 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 b81732a68..67032bae7 100644 --- 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 b79b3771f..231e42025 100644 --- 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 313e27247..00d5c6789 100644 --- 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 1179ea604..f9c4e1653 100644 --- 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); } -- 2.39.2