X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fmanagesieve%2Fserv_managesieve.c;h=289bc5784ecafe8817a736a81e545881bb9f4e22;hb=e26a8dee20d1726b4995821f717f867f50fc5659;hp=0bdc0f1001fe03873b7dbbd0e6b7593d3c742720;hpb=f1ee61891901850ebbdee1e9440b363dc6df540a;p=citadel.git

diff --git a/citadel/modules/managesieve/serv_managesieve.c b/citadel/modules/managesieve/serv_managesieve.c
index 0bdc0f100..289bc5784 100644
--- 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;
@@ -279,7 +279,6 @@ void cmd_mgsve_auth(int num_parms, char **parms, struct sdm_userdata *u)
 		/* todo, check length*/
 	{
 		char auth[SIZ];
-		int retval;
 		char *message;
 		char *username;
 
@@ -289,10 +288,10 @@ void cmd_mgsve_auth(int num_parms, char **parms, struct sdm_userdata *u)
 			message = ReadString(GetSizeToken(parms[2]), parms[0]);
 		
 		if (message != NULL) {/**< do we have tokenized login? */
-			retval = CtdlDecodeBase64(auth, MGSVE->transmitted_message, SIZ);
+			CtdlDecodeBase64(auth, MGSVE->transmitted_message, SIZ);
 		}
 		else 
-			retval = CtdlDecodeBase64(auth, parms[2], SIZ);
+			CtdlDecodeBase64(auth, parms[2], SIZ);
 		username = auth;
 		if ((*username == '\0') && (*(username + 1) != '\0'))
 			username ++;
@@ -314,7 +313,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 +329,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");
 	syslog(LOG_NOTICE, "MgSve bye.");
-	CC->kill_me = 1;
+	CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
 }
 
 
-/**
+/*
  * HAVESPACE command. see chapter 2.5 
  */
 void cmd_mgsve_havespace(void)
@@ -352,7 +351,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 +361,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 +395,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;
 	} 
 
@@ -464,7 +463,7 @@ void cmd_mgsve_getscript(int num_parms, char **parms, struct sdm_userdata *u)
 			slen = strlen(script_content);
 			outbuf = malloc (slen + 64);
 			snprintf(outbuf, slen + 64, "{%ld+}\r\n%s\r\nOK\r\n",slen, script_content);
-			cprintf(outbuf);
+			cprintf("%s", outbuf);
 		}
 		else
 			cprintf("No \"there is no script by that name %s \"\r\n", parms[1]);
@@ -585,8 +584,8 @@ void managesieve_command_loop(void) {
 		length = strlen(parms[0]);
 	}
 	if (length < 1) {
-		syslog(LOG_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;
 	}
 	syslog(LOG_INFO, "MANAGESIEVE: %s\n", cmdbuf);
@@ -635,7 +634,7 @@ void managesieve_command_loop(void) {
 	else {
 		cprintf("No Invalid access or command.\r\n");
 		syslog(LOG_INFO, "illegal Managesieve command: %s", parms[0]);
-		CC->kill_me = 1;
+		CC->kill_me = KILLME_ILLEGAL_MANAGESIEVE_COMMAND;
 	}
 
 
@@ -670,7 +669,7 @@ CTDL_MODULE_INIT(managesieve)
 		CtdlRegisterSessionHook(managesieve_cleanup_function, EVT_STOP);
 	}
 	
-	/* return our Subversion id for the Log */
+	/* return our module name for the log */
 	return "managesieve";
 }