From d9a896503ba54a3b0b3c95059bac85541ba55090 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 14 Mar 2011 12:59:46 -0400 Subject: [PATCH] Added protocol names to all 'client disconnected' syslogs --- citadel/citserver.c | 2 +- citadel/modules/imap/imap_acl.c | 4 +- citadel/modules/imap/imap_fetch.c | 4 +- citadel/modules/imap/imap_list.c | 2 +- citadel/modules/imap/imap_metadata.c | 2 +- citadel/modules/imap/imap_misc.c | 4 +- citadel/modules/imap/imap_search.c | 3 +- citadel/modules/imap/imap_store.c | 2 +- citadel/modules/imap/imap_tools.c | 2 +- citadel/modules/imap/serv_imap.c | 62 +++++++++---------- .../modules/managesieve/serv_managesieve.c | 2 +- citadel/modules/pop3/serv_pop3.c | 2 +- citadel/modules/smtp/serv_smtp.c | 2 +- citadel/modules/vcard/serv_vcard.c | 2 +- citadel/modules/xmpp/serv_xmpp.c | 2 +- 15 files changed, 48 insertions(+), 49 deletions(-) diff --git a/citadel/citserver.c b/citadel/citserver.c index 42fb045a4..13791feee 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1042,7 +1042,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) { - syslog(LOG_ERR, "Client disconnected: ending session.\n"); + syslog(LOG_ERR, "Citadel client disconnected: ending session.\n"); CC->kill_me = KILLME_CLIENT_DISCONNECTED; CtdlThreadName(old_name); return; diff --git a/citadel/modules/imap/imap_acl.c b/citadel/modules/imap/imap_acl.c index 48aae83c0..0ca96dfc8 100644 --- a/citadel/modules/imap/imap_acl.c +++ b/citadel/modules/imap/imap_acl.c @@ -2,9 +2,9 @@ * Functions which implement RFC2086 (and maybe RFC4314) (IMAP ACL extension) * * - * Copyright (c) 2007-2009 by the citadel.org team + * Copyright (c) 2007-2011 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c index db0fbeae8..862f58757 100644 --- a/citadel/modules/imap/imap_fetch.c +++ b/citadel/modules/imap/imap_fetch.c @@ -2,9 +2,9 @@ * Implements the FETCH command in IMAP. * This is a good example of the protocol's gratuitous complexity. * - * Copyright (c) 2001-2009 by the citadel.org team + * Copyright (c) 2001-2011 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. diff --git a/citadel/modules/imap/imap_list.c b/citadel/modules/imap/imap_list.c index 49c19a666..f66f12133 100644 --- a/citadel/modules/imap/imap_list.c +++ b/citadel/modules/imap/imap_list.c @@ -3,7 +3,7 @@ * * Copyright (c) 2000-2009 by Art Cancro and others. * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. diff --git a/citadel/modules/imap/imap_metadata.c b/citadel/modules/imap/imap_metadata.c index 73a2f71a3..cfbc10370 100644 --- a/citadel/modules/imap/imap_metadata.c +++ b/citadel/modules/imap/imap_metadata.c @@ -5,7 +5,7 @@ * * Copyright (c) 2007-2009 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c index 203b75c3e..3392c71bc 100644 --- a/citadel/modules/imap/imap_misc.c +++ b/citadel/modules/imap/imap_misc.c @@ -1,7 +1,7 @@ /* - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2011 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. diff --git a/citadel/modules/imap/imap_search.c b/citadel/modules/imap/imap_search.c index 8a8673e6a..af9865f14 100644 --- a/citadel/modules/imap/imap_search.c +++ b/citadel/modules/imap/imap_search.c @@ -1,8 +1,7 @@ /* * Implements IMAP's gratuitously complex SEARCH command. * - * - * Copyright (c) 2001-2009 by the citadel.org team + * Copyright (c) 2001-2011 by the citadel.org team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/citadel/modules/imap/imap_store.c b/citadel/modules/imap/imap_store.c index dceefbbbe..959e1235d 100644 --- a/citadel/modules/imap/imap_store.c +++ b/citadel/modules/imap/imap_store.c @@ -3,7 +3,7 @@ * * Copyright (c) 2001-2009 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. diff --git a/citadel/modules/imap/imap_tools.c b/citadel/modules/imap/imap_tools.c index cb99d7a67..67cd1bcc5 100644 --- a/citadel/modules/imap/imap_tools.c +++ b/citadel/modules/imap/imap_tools.c @@ -4,7 +4,7 @@ * Copyright (c) 2001-2009 by the citadel.org team and others, except for * most of the UTF7 and UTF8 handling code which was lifted from Evolution. * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c index 29ab6536b..785d6e53c 100644 --- a/citadel/modules/imap/serv_imap.c +++ b/citadel/modules/imap/serv_imap.c @@ -1,13 +1,14 @@ /* * IMAP server for the Citadel system - * Copyright (C) 2000-2009 by Art Cancro and others. + * + * Copyright (C) 2000-2011 by Art Cancro and others. * This code is released under the terms of the GNU General Public License. * * WARNING: the IMAP protocol is badly designed. No implementation of it * is perfect. Indeed, with so much gratuitous complexity, *all* IMAP * implementations have bugs. * - * This program is free software; you can redistribute it and/or modify + * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. @@ -115,14 +116,14 @@ const imap_handler_hook *imap_lookup(int num_parms, ConstStr *Params) ChrPtr(Imap->Reply)); if (GetHash(ImapCmds, SKEY(Imap->Reply), &v)) { - syslog(LOG_DEBUG, "Found. \n"); + syslog(LOG_DEBUG, "Found."); FlushStrBuf(Imap->Reply); return (imap_handler_hook *) v; } if (num_parms == 1) { - syslog(LOG_DEBUG, "NOT Found. \n"); + syslog(LOG_DEBUG, "NOT Found."); FlushStrBuf(Imap->Reply); return NULL; } @@ -133,11 +134,11 @@ const imap_handler_hook *imap_lookup(int num_parms, ConstStr *Params) StrBufUpCase(Imap->Reply); if (GetHash(ImapCmds, SKEY(Imap->Reply), &v)) { - syslog(LOG_DEBUG, "Found. \n"); + syslog(LOG_DEBUG, "Found."); FlushStrBuf(Imap->Reply); return (imap_handler_hook *) v; } - syslog(LOG_DEBUG, "NOT Found. \n"); + syslog(LOG_DEBUG, "NOT Found."); FlushStrBuf(Imap->Reply); return NULL; } @@ -306,8 +307,7 @@ void imap_load_msgids(void) citimap *Imap = IMAP; if (Imap->selected == 0) { - syslog(LOG_ERR, - "imap_load_msgids() can't run; no room selected\n"); + syslog(LOG_ERR, "imap_load_msgids() can't run; no room selected"); return; } @@ -348,7 +348,7 @@ void imap_rescan_msgids(void) int num_recent = 0; if (Imap->selected == 0) { - syslog(LOG_ERR, "imap_load_msgids() can't run; no room selected\n"); + syslog(LOG_ERR, "imap_load_msgids() can't run; no room selected"); return; } @@ -368,8 +368,9 @@ void imap_rescan_msgids(void) if (cdbfr != NULL) { msglist = malloc(cdbfr->len); if (msglist == NULL) { - syslog(LOG_CRIT, "malloc() failed\n"); - abort(); + syslog(LOG_CRIT, "IMAP: malloc() failed"); + CC->kill_me = KILLME_MALLOC_FAILED; + return; } memcpy(msglist, cdbfr->ptr, (size_t)cdbfr->len); num_msgs = cdbfr->len / sizeof(long); @@ -483,7 +484,7 @@ void imap_cleanup_function(void) imap_do_expunge(); } - syslog(LOG_DEBUG, "Performing IMAP cleanup hook\n"); + syslog(LOG_DEBUG, "Performing IMAP cleanup hook"); imap_free_msgids(); imap_free_transmitted_message(); @@ -503,7 +504,7 @@ void imap_cleanup_function(void) FreeStrBuf(&Imap->Reply); if (Imap->Cmd.Params != NULL) free(Imap->Cmd.Params); free(Imap); - syslog(LOG_DEBUG, "Finished IMAP cleanup hook\n"); + syslog(LOG_DEBUG, "Finished IMAP cleanup hook"); } @@ -918,7 +919,7 @@ int imap_do_expunge(void) long *delmsgs = NULL; int num_delmsgs = 0; - syslog(LOG_DEBUG, "imap_do_expunge() called\n"); + syslog(LOG_DEBUG, "imap_do_expunge() called"); if (Imap->selected == 0) { return (0); } @@ -941,7 +942,7 @@ int imap_do_expunge(void) imap_rescan_msgids(); } - syslog(LOG_DEBUG, "Expunged %d messages from <%s>\n", num_expunged, CC->room.QRname); + syslog(LOG_DEBUG, "Expunged %d messages from <%s>", num_expunged, CC->room.QRname); return (num_expunged); } @@ -1036,14 +1037,14 @@ void imap_create(int num_parms, ConstStr *Params) if (strchr(Params[2].Key, '\\') != NULL) { IReply("NO Invalid character in folder name"); - syslog(LOG_DEBUG, "invalid character in folder name\n"); + syslog(LOG_DEBUG, "invalid character in folder name"); return; } ret = imap_roomname(roomname, sizeof roomname, Params[2].Key); if (ret < 0) { IReply("NO Invalid mailbox name or location"); - syslog(LOG_DEBUG, "invalid mailbox name or location\n"); + syslog(LOG_DEBUG, "invalid mailbox name or location"); return; } floornum = (ret & 0x00ff); /* lower 8 bits = floor number */ @@ -1052,7 +1053,7 @@ void imap_create(int num_parms, ConstStr *Params) if (flags & IR_MAILBOX) { if (strncasecmp(Params[2].Key, "INBOX/", 6)) { IReply("NO Personal folders must be created under INBOX"); - syslog(LOG_DEBUG, "not subordinate to inbox\n"); + syslog(LOG_DEBUG, "not subordinate to inbox"); return; } } @@ -1065,7 +1066,7 @@ void imap_create(int num_parms, ConstStr *Params) newroomview = VIEW_BBS; } - syslog(LOG_INFO, "Create new room <%s> on floor <%d> with type <%d>\n", + syslog(LOG_INFO, "IMAP: Create new room <%s> on floor <%d> with type <%d>", roomname, floornum, newroomtype); ret = CtdlCreateRoom(roomname, newroomtype, "", floornum, 1, 0, newroomview); @@ -1087,7 +1088,7 @@ void imap_create(int num_parms, ConstStr *Params) CtdlAideMessage(notification_message, "Room Creation Message"); free(notification_message); } - syslog(LOG_DEBUG, "imap_create() completed\n"); + syslog(LOG_DEBUG, "imap_create() completed"); } @@ -1450,7 +1451,7 @@ void imap_rename(int num_parms, ConstStr *Params) irl->irl_newfloor); if (r != crr_ok) { /* FIXME handle error returns better */ - syslog(LOG_ERR, "CtdlRenameRoom() error %d\n", r); + syslog(LOG_ERR, "IMAP: CtdlRenameRoom() error %d", r); } irlp = irl; irl = irl->next; @@ -1492,23 +1493,23 @@ void imap_command_loop(void) FlushStrBuf(Imap->Cmd.CmdBuf); if (CtdlClientGetLine(Imap->Cmd.CmdBuf) < 1) { - syslog(LOG_ERR, "Client disconnected: ending session.\r\n"); + syslog(LOG_ERR, "IMAP: client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } if (Imap->authstate == imap_as_expecting_password) { - syslog(LOG_INFO, "IMAP: \n"); + syslog(LOG_INFO, "IMAP: "); } else if (Imap->authstate == imap_as_expecting_plainauth) { - syslog(LOG_INFO, "IMAP: \n"); + syslog(LOG_INFO, "IMAP: "); } else if ((Imap->authstate == imap_as_expecting_multilineusername) || cbmstrcasestr(ChrPtr(Imap->Cmd.CmdBuf), " LOGIN ")) { - syslog(LOG_INFO, "IMAP: LOGIN...\n"); + syslog(LOG_INFO, "IMAP: LOGIN..."); } else { - syslog(LOG_INFO, "IMAP: %s\n", ChrPtr(Imap->Cmd.CmdBuf)); + syslog(LOG_INFO, "IMAP: %s", ChrPtr(Imap->Cmd.CmdBuf)); } pchs = ChrPtr(Imap->Cmd.CmdBuf); @@ -1564,17 +1565,16 @@ void imap_command_loop(void) /* debug output the parsed vector */ { int i; - syslog(LOG_DEBUG, "----- %ld params \n", - Imap->Cmd.num_parms); + syslog(LOG_DEBUG, "----- %ld params", Imap->Cmd.num_parms); for (i=0; i < Imap->Cmd.num_parms; i++) { if (Imap->Cmd.Params[i].len != strlen(Imap->Cmd.Params[i].Key)) - syslog(LOG_DEBUG, "*********** %ld != %ld : %s\n", + syslog(LOG_DEBUG, "*********** %ld != %ld : %s", Imap->Cmd.Params[i].len, strlen(Imap->Cmd.Params[i].Key), Imap->Cmd.Params[i].Key); else - syslog(LOG_DEBUG, "%ld : %s\n", + syslog(LOG_DEBUG, "%ld : %s", Imap->Cmd.Params[i].len, Imap->Cmd.Params[i].Key); }} @@ -1627,7 +1627,7 @@ BAIL: gettimeofday(&tv2, NULL); total_time = (tv2.tv_usec + (tv2.tv_sec * 1000000)) - (tv1.tv_usec + (tv1.tv_sec * 1000000)); - syslog(LOG_DEBUG, "IMAP command completed in %ld.%ld seconds\n", + syslog(LOG_DEBUG, "IMAP command completed in %ld.%ld seconds", (total_time / 1000000), (total_time % 1000000) ); diff --git a/citadel/modules/managesieve/serv_managesieve.c b/citadel/modules/managesieve/serv_managesieve.c index db1d92ce5..965cff964 100644 --- a/citadel/modules/managesieve/serv_managesieve.c +++ b/citadel/modules/managesieve/serv_managesieve.c @@ -585,7 +585,7 @@ void managesieve_command_loop(void) { length = strlen(parms[0]); } if (length < 1) { - syslog(LOG_CRIT, "Client disconnected: ending session.\n"); + syslog(LOG_CRIT, "managesieve: client disconnected: ending session.\n"); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } diff --git a/citadel/modules/pop3/serv_pop3.c b/citadel/modules/pop3/serv_pop3.c index b8f3cb073..caba33187 100644 --- a/citadel/modules/pop3/serv_pop3.c +++ b/citadel/modules/pop3/serv_pop3.c @@ -569,7 +569,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) { - syslog(LOG_ERR, "Client disconnected: ending session."); + syslog(LOG_ERR, "POP3 client disconnected: ending session."); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c index 6c7480adf..e2d9766a6 100644 --- a/citadel/modules/smtp/serv_smtp.c +++ b/citadel/modules/smtp/serv_smtp.c @@ -840,7 +840,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) { - syslog(LOG_CRIT, "Client disconnected: ending session.\n"); + syslog(LOG_CRIT, "SMTP: client disconnected: ending session.\n"); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 39c401786..8340d4eeb 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -1116,7 +1116,7 @@ void check_get(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - syslog(LOG_CRIT, "Client disconnected: ending session.\n"); + syslog(LOG_CRIT, "vcard client disconnected: ending session.\n"); CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index d158b819d..94d35b1d0 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -549,7 +549,7 @@ void xmpp_command_loop(void) { XML_Parse(XMPP->xp, ChrPtr(stream_input), rc, 0); } else { - syslog(LOG_ERR, "Client disconnected: ending session.\n"); + syslog(LOG_ERR, "XMPP: client disconnected: ending session.\n"); CC->kill_me = KILLME_CLIENT_DISCONNECTED; } FreeStrBuf(&stream_input); -- 2.30.2