Added protocol names to all 'client disconnected' syslogs

[citadel.git] / citadel / modules / managesieve / serv_managesieve.c

diff --git a/citadel/modules/managesieve/serv_managesieve.c b/citadel/modules/managesieve/serv_managesieve.c
index f1523d73bf793ab1ebdd9a73c49056ee78e41ea2..965cff9648d71169db9c7a0f862f091365d4f991 100644 (file)
--- a/citadel/modules/managesieve/serv_managesieve.c
+++ b/citadel/modules/managesieve/serv_managesieve.c
@@ -251,13 +251,13 @@ char *ReadString(long size, char *command)
        if (size < 1) {
                cprintf("NO %s: %ld BAD Message length must be at least 1.\r\n",
                        command, size);
-               CC->kill_me = 1;
+               CC->kill_me = KILLME_READSTRING_FAILED;
                return NULL;
        }
        MGSVE->transmitted_message = malloc(size + 2);
        if (MGSVE->transmitted_message == NULL) {
                cprintf("NO %s Cannot allocate memory.\r\n", command);
-               CC->kill_me = 1;
+               CC->kill_me = KILLME_MALLOC_FAILED;
                return NULL;
        }
        MGSVE->transmitted_length = size;
@@ -314,7 +314,7 @@ void cmd_mgsve_auth(int num_parms, char **parms, struct sdm_userdata *u)
                }
        }
        cprintf("NO \"Authentication Failure.\"\r\n");/* we just support auth plain. */
-       CC->kill_me = 1;
+       CC->kill_me = KILLME_AUTHFAILED;
 }
 
 
@@ -330,18 +330,18 @@ void cmd_mgsve_starttls(void)
 
 
 
-/**
- *LOGOUT command, see chapter 2.3 
+/*
+ * LOGOUT command, see chapter 2.3 
  */
 void cmd_mgsve_logout(struct sdm_userdata *u)
 {
        cprintf("OK\r\n");
-       CtdlLogPrintf(CTDL_NOTICE, "MgSve bye.");
-       CC->kill_me = 1;
+       syslog(LOG_NOTICE, "MgSve bye.");
+       CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
 }
 
 
-/**
+/*
  * HAVESPACE command. see chapter 2.5 
  */
 void cmd_mgsve_havespace(void)
@@ -352,7 +352,7 @@ void cmd_mgsve_havespace(void)
        if (MGSVE->command_state != mgsve_password)
        {
                cprintf("NO\r\n");
-               CC->kill_me = 1;
+               CC->kill_me = KILLME_QUOTA;
        }
        else
        {
@@ -362,7 +362,7 @@ void cmd_mgsve_havespace(void)
        }
 }
 
-/**
+/*
  * PUTSCRIPT command, see chapter 2.6 
  */
 void cmd_mgsve_putscript(int num_parms, char **parms, struct sdm_userdata *u)
@@ -396,7 +396,7 @@ void cmd_mgsve_putscript(int num_parms, char **parms, struct sdm_userdata *u)
        }
        else {
                cprintf("%s NO Read failed.\r\n", parms[0]);
-               CC->kill_me = 1;
+               CC->kill_me = KILLME_READ_FAILED;
                return;
        } 
 
@@ -585,11 +585,11 @@ void managesieve_command_loop(void) {
                length = strlen(parms[0]);
        }
        if (length < 1) {
-               CtdlLogPrintf(CTDL_CRIT, "Client disconnected: ending session.\n");
-               CC->kill_me = 1;
+               syslog(LOG_CRIT, "managesieve: client disconnected: ending session.\n");
+               CC->kill_me = KILLME_CLIENT_DISCONNECTED;
                return;
        }
-       CtdlLogPrintf(CTDL_INFO, "MANAGESIEVE: %s\n", cmdbuf);
+       syslog(LOG_INFO, "MANAGESIEVE: %s\n", cmdbuf);
        if ((length>= 12) && (!strncasecmp(parms[0], "AUTHENTICATE", 12))){
                cmd_mgsve_auth(num_parms, parms, &u);
        }
@@ -634,8 +634,8 @@ void managesieve_command_loop(void) {
        }
        else {
                cprintf("No Invalid access or command.\r\n");
-               CtdlLogPrintf(CTDL_INFO, "illegal Managesieve command: %s", parms[0]);
-               CC->kill_me = 1;
+               syslog(LOG_INFO, "illegal Managesieve command: %s", parms[0]);
+               CC->kill_me = KILLME_ILLEGAL_MANAGESIEVE_COMMAND;
        }
 
 
@@ -650,7 +650,7 @@ void managesieve_cleanup_function(void) {
        /* Don't do this stuff if this is not a managesieve session! */
        if (CC->h_command_function != managesieve_command_loop) return;
 
-       CtdlLogPrintf(CTDL_DEBUG, "Performing managesieve cleanup hook\n");
+       syslog(LOG_DEBUG, "Performing managesieve cleanup hook\n");
        free(MGSVE);
 }