* Retab, no functional changes

1 files changed, 319 insertions, 323 deletions

diff --git a/src/lmtp_proto.c b/src/lmtp_proto.c
index 7fbc38684..2c0ffa9d4 100644
--- a/src/lmtp_proto.c
+++ b/src/lmtp_proto.c
@@ -33,40 +33,44 @@
 #define OUTBUFSIZ 1000
 
 /* LMTP commands */
-static f_str_t lhlo_command = {
+static f_str_t                  lhlo_command = {
 	.begin = "LHLO",
 	.len = sizeof ("LHLO") - 1
 };
-static f_str_t mail_command = {
+
+static f_str_t                  mail_command = {
 	.begin = "MAIL FROM:",
 	.len = sizeof ("MAIL FROM:") - 1
 };
-static f_str_t rcpt_command = {
+
+static f_str_t                  rcpt_command = {
 	.begin = "RCPT TO:",
 	.len = sizeof ("RCPT TO:") - 1
 };
-static f_str_t data_command = {
+
+static f_str_t                  data_command = {
 	.begin = "DATA",
 	.len = sizeof ("DATA") - 1
 };
-static f_str_t data_dot = {
+
+static f_str_t                  data_dot = {
 	.begin = ".\r\n",
 	.len = sizeof (".\r\n") - 1
 };
 
-static const char *mail_regexp = "[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?";
-static GRegex *mail_re = NULL;
+static const char              *mail_regexp = "[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?";
+static GRegex                  *mail_re = NULL;
 
 /*
  * Extract e-mail from read line 
  * return <> if no valid address detected
  */
-static char *
-extract_mail (memory_pool_t *pool, f_str_t *line)
+static char                    *
+extract_mail (memory_pool_t * pool, f_str_t * line)
 {
-	GError *err = NULL;
-	char *match;
-	GMatchInfo *info;
+	GError                         *err = NULL;
+	char                           *match;
+	GMatchInfo                     *info;
 
 	if (mail_re == NULL) {
 		/* Compile regexp */
@@ -87,9 +91,9 @@ extract_mail (memory_pool_t *pool, f_str_t *line)
 static void
 out_lmtp_reply (struct worker_task *task, int code, char *rcode, char *msg)
 {
-	char outbuf[OUTBUFSIZ];
-	int r;
-	
+	char                            outbuf[OUTBUFSIZ];
+	int                             r;
+
 	if (*rcode == '\0') {
 		r = snprintf (outbuf, OUTBUFSIZ, "%d %s\r\n", code, msg);
 	}
@@ -99,144 +103,144 @@ out_lmtp_reply (struct worker_task *task, int code, char *rcode, char *msg)
 	rspamd_dispatcher_write (task->dispatcher, outbuf, r, FALSE, FALSE);
 }
 
-int 
-read_lmtp_input_line (struct rspamd_lmtp_proto *lmtp, f_str_t *line)
+int
+read_lmtp_input_line (struct rspamd_lmtp_proto *lmtp, f_str_t * line)
 {
-	char *c, *rcpt;
-	f_str_t fstr;
-	unsigned int i = 0, l = 0, size;
+	char                           *c, *rcpt;
+	f_str_t                         fstr;
+	unsigned int                    i = 0, l = 0, size;
 
 	switch (lmtp->state) {
-		case LMTP_READ_LHLO:
-			/* Search LHLO line */
-			if ((i = fstrstri (line, &lhlo_command)) == -1) {
-				msg_info ("read_lmtp_input_line: LHLO expected but not found");
-				out_lmtp_reply (lmtp->task, LMTP_BAD_CMD, "5.0.0", "Need LHLO here");
-				return -1;
-			}
-			else {
-				i += lhlo_command.len;
-				c = line->begin + i;
-				/* Skip spaces */
-				while (g_ascii_isspace (*c) && i < line->len) {
-					i ++;
-					c ++;
-				}
-				lmtp->task->helo = memory_pool_alloc (lmtp->task->task_pool, line->len - i + 1);
-				/* Strlcpy makes string null terminated by design */
-				g_strlcpy (lmtp->task->helo, c, line->len - i + 1);
-				lmtp->state = LMTP_READ_FROM;
-				out_lmtp_reply (lmtp->task, LMTP_OK, "", "Ok");
-				return 0;
+	case LMTP_READ_LHLO:
+		/* Search LHLO line */
+		if ((i = fstrstri (line, &lhlo_command)) == -1) {
+			msg_info ("read_lmtp_input_line: LHLO expected but not found");
+			out_lmtp_reply (lmtp->task, LMTP_BAD_CMD, "5.0.0", "Need LHLO here");
+			return -1;
+		}
+		else {
+			i += lhlo_command.len;
+			c = line->begin + i;
+			/* Skip spaces */
+			while (g_ascii_isspace (*c) && i < line->len) {
+				i++;
+				c++;
 			}
-			break;
-		case LMTP_READ_FROM:
-			/* Search MAIL FROM: line */
-			if ((i = fstrstri (line, &mail_command)) == -1) {
-				msg_info ("read_lmtp_input_line: MAIL expected but not found");
-				out_lmtp_reply (lmtp->task, LMTP_BAD_CMD, "5.0.0", "Need MAIL here");
+			lmtp->task->helo = memory_pool_alloc (lmtp->task->task_pool, line->len - i + 1);
+			/* Strlcpy makes string null terminated by design */
+			g_strlcpy (lmtp->task->helo, c, line->len - i + 1);
+			lmtp->state = LMTP_READ_FROM;
+			out_lmtp_reply (lmtp->task, LMTP_OK, "", "Ok");
+			return 0;
+		}
+		break;
+	case LMTP_READ_FROM:
+		/* Search MAIL FROM: line */
+		if ((i = fstrstri (line, &mail_command)) == -1) {
+			msg_info ("read_lmtp_input_line: MAIL expected but not found");
+			out_lmtp_reply (lmtp->task, LMTP_BAD_CMD, "5.0.0", "Need MAIL here");
+			return -1;
+		}
+		else {
+			i += mail_command.len;
+			c = line->begin + i;
+			fstr.begin = line->begin + i;
+			fstr.len = line->len - i;
+			lmtp->task->from = extract_mail (lmtp->task->task_pool, &fstr);
+			lmtp->state = LMTP_READ_RCPT;
+			out_lmtp_reply (lmtp->task, LMTP_OK, "2.1.0", "Sender ok");
+			return 0;
+		}
+		break;
+	case LMTP_READ_RCPT:
+		/* Search RCPT_TO: line */
+		if ((i = fstrstri (line, &rcpt_command)) == -1) {
+			msg_info ("read_lmtp_input_line: RCPT expected but not found");
+			out_lmtp_reply (lmtp->task, LMTP_NO_RCPT, "5.5.4", "Need RCPT here");
+			return -1;
+		}
+		else {
+			i += rcpt_command.len;
+			c = line->begin + i;
+			fstr.begin = line->begin + i;
+			fstr.len = line->len - i;
+			rcpt = extract_mail (lmtp->task->task_pool, &fstr);
+			if (*rcpt == '<' && *(rcpt + 1) == '>') {
+				/* Invalid or empty rcpt not allowed */
+				msg_info ("read_lmtp_input_line: bad recipient");
+				out_lmtp_reply (lmtp->task, LMTP_NO_RCPT, "5.5.4", "Bad recipient");
 				return -1;
 			}
-			else {
-				i += mail_command.len;
-				c = line->begin + i;
-				fstr.begin = line->begin + i;
-				fstr.len = line->len - i;
-				lmtp->task->from = extract_mail (lmtp->task->task_pool, &fstr);
-				lmtp->state = LMTP_READ_RCPT;
-				out_lmtp_reply (lmtp->task, LMTP_OK, "2.1.0", "Sender ok");
-				return 0;
-			}
-			break;
-		case LMTP_READ_RCPT:
-			/* Search RCPT_TO: line */
-			if ((i = fstrstri (line, &rcpt_command)) == -1) {
-				msg_info ("read_lmtp_input_line: RCPT expected but not found");
-				out_lmtp_reply (lmtp->task, LMTP_NO_RCPT, "5.5.4", "Need RCPT here");
-				return -1;
+			/* Strlcpy makes string null terminated by design */
+			lmtp->task->rcpt = g_list_prepend (lmtp->task->rcpt, rcpt);
+			lmtp->state = LMTP_READ_DATA;
+			out_lmtp_reply (lmtp->task, LMTP_OK, "2.1.0", "Recipient ok");
+			return 0;
+		}
+		break;
+	case LMTP_READ_DATA:
+		/* Search DATA line */
+		if ((i = fstrstri (line, &data_command)) == -1) {
+			msg_info ("read_lmtp_input_line: DATA expected but not found");
+			out_lmtp_reply (lmtp->task, LMTP_BAD_CMD, "5.0.0", "Need DATA here");
+			return -1;
+		}
+		else {
+			i += data_command.len;
+			c = line->begin + i;
+			/* Skip spaces */
+			while (g_ascii_isspace (*c++)) {
+				i++;
 			}
-			else {
-				i += rcpt_command.len;
-				c = line->begin + i;
-				fstr.begin = line->begin + i;
-				fstr.len = line->len - i;
-				rcpt = extract_mail (lmtp->task->task_pool, &fstr);
-				if (*rcpt == '<' && *(rcpt + 1) == '>') {
-					/* Invalid or empty rcpt not allowed */
-					msg_info ("read_lmtp_input_line: bad recipient");
-					out_lmtp_reply (lmtp->task, LMTP_NO_RCPT, "5.5.4", "Bad recipient");
-					return -1;
+			rcpt = memory_pool_alloc (lmtp->task->task_pool, line->len - i + 1);
+			/* Strlcpy makes string null terminated by design */
+			g_strlcpy (rcpt, c, line->len - i + 1);
+			lmtp->task->rcpt = g_list_prepend (lmtp->task->rcpt, rcpt);
+			lmtp->state = LMTP_READ_MESSAGE;
+			out_lmtp_reply (lmtp->task, LMTP_DATA, "", "Enter message, ending with \".\" on a line by itself");
+			lmtp->task->msg = fstralloc (lmtp->task->task_pool, BUFSIZ);
+			return 0;
+		}
+		break;
+	case LMTP_READ_MESSAGE:
+		if (strncmp (line->begin, data_dot.begin, line->len) == 0) {
+			lmtp->state = LMTP_READ_DOT;
+			lmtp->task->state = READ_MESSAGE;
+			return 0;
+		}
+		else {
+			l = lmtp->task->msg->len;
+			size = lmtp->task->msg->size;
+			if (l + line->len > size) {
+				/* Grow buffer */
+				if (line->len > size) {
+					size += line->len << 1;
 				}
-				/* Strlcpy makes string null terminated by design */
-				lmtp->task->rcpt = g_list_prepend (lmtp->task->rcpt, rcpt);
-				lmtp->state = LMTP_READ_DATA;
-				out_lmtp_reply (lmtp->task, LMTP_OK, "2.1.0", "Recipient ok");
-				return 0;
-			}
-			break;
-		case LMTP_READ_DATA:
-			/* Search DATA line */
-			if ((i = fstrstri (line, &data_command)) == -1) {
-				msg_info ("read_lmtp_input_line: DATA expected but not found");
-				out_lmtp_reply (lmtp->task, LMTP_BAD_CMD, "5.0.0", "Need DATA here");
-				return -1;
-			}
-			else {
-				i += data_command.len;
-				c = line->begin + i;
-				/* Skip spaces */
-				while (g_ascii_isspace (*c++)) {
-					i ++;
+				else {
+					/* size *= 2 */
+					size <<= 1;
 				}
-				rcpt = memory_pool_alloc (lmtp->task->task_pool, line->len - i + 1);
-				/* Strlcpy makes string null terminated by design */
-				g_strlcpy (rcpt, c, line->len - i + 1);
-				lmtp->task->rcpt = g_list_prepend (lmtp->task->rcpt, rcpt);
-				lmtp->state = LMTP_READ_MESSAGE;
-				out_lmtp_reply (lmtp->task, LMTP_DATA, "", "Enter message, ending with \".\" on a line by itself");
-				lmtp->task->msg = fstralloc (lmtp->task->task_pool, BUFSIZ);
-				return 0;
+				lmtp->task->msg = fstrgrow (lmtp->task->task_pool, lmtp->task->msg, size);
 			}
-			break;
-		case LMTP_READ_MESSAGE:
-			if (strncmp (line->begin, data_dot.begin, line->len) == 0) {
-				lmtp->state = LMTP_READ_DOT;
-				lmtp->task->state = READ_MESSAGE;
-				return 0;
-			}
-			else {
-				l = lmtp->task->msg->len;
-				size = lmtp->task->msg->size;
-				if (l + line->len > size) {
-					/* Grow buffer */
-					if (line->len > size) {
-						size += line->len << 1;
-					}
-					else {
-						/* size *= 2 */
-						size <<= 1;
-					}
-					lmtp->task->msg = fstrgrow (lmtp->task->task_pool, lmtp->task->msg, size);
-				}
-				fstrcat (lmtp->task->msg, line);
-				return 0;
-			}
-			break;
-		case LMTP_READ_DOT:
-			/* We have some input after reading dot, close connection as we have no currently support of multiply 
-			 * messages per session
-			 */
-			out_lmtp_reply (lmtp->task, LMTP_QUIT, "", "Bye");
+			fstrcat (lmtp->task->msg, line);
 			return 0;
-			break;
-	}	
+		}
+		break;
+	case LMTP_READ_DOT:
+		/* We have some input after reading dot, close connection as we have no currently support of multiply 
+		 * messages per session
+		 */
+		out_lmtp_reply (lmtp->task, LMTP_QUIT, "", "Bye");
+		return 0;
+		break;
+	}
 
 	return 0;
 }
 
 struct mta_callback_data {
-	struct worker_task *task;
-	rspamd_io_dispatcher_t *dispatcher;
+	struct worker_task             *task;
+	rspamd_io_dispatcher_t         *dispatcher;
 	enum {
 		LMTP_WANT_GREETING,
 		LMTP_WANT_MAIL,
@@ -247,37 +251,33 @@ struct mta_callback_data {
 	} state;
 };
 
-static gboolean
-parse_mta_str (f_str_t *in, struct mta_callback_data *cd)
+static                          gboolean
+parse_mta_str (f_str_t * in, struct mta_callback_data *cd)
 {
-	int r;
-	static f_str_t okres1 = {
+	int                             r;
+	static f_str_t                  okres1 = {
 		.begin = "250 ",
 		.len = sizeof ("250 ") - 1,
-	},
-	okres2 = {
-		.begin = "220 ",
-		.len = sizeof ("220 ") - 1,
-	},
-	datares = {
-		.begin = "354 ",
-		.len = sizeof ("354 ") - 1,
-	};
+	}
+	, okres2 = {
+	.begin = "220 ",.len = sizeof ("220 ") - 1,}
+	, datares = {
+	.begin = "354 ",.len = sizeof ("354 ") - 1,};
 
 	switch (cd->state) {
-		case LMTP_WANT_GREETING:
-		case LMTP_WANT_MAIL:
-		case LMTP_WANT_RCPT:
-		case LMTP_WANT_DATA:
-		case LMTP_WANT_CLOSING:
-			r = fstrstr (in, &okres1);
-			if (r == -1) {
-				r = fstrstr (in, &okres2);
-			}
-			break;
-		case LMTP_WANT_DOT:
-			r = fstrstr (in, &datares);
-			break;
+	case LMTP_WANT_GREETING:
+	case LMTP_WANT_MAIL:
+	case LMTP_WANT_RCPT:
+	case LMTP_WANT_DATA:
+	case LMTP_WANT_CLOSING:
+		r = fstrstr (in, &okres1);
+		if (r == -1) {
+			r = fstrstr (in, &okres2);
+		}
+		break;
+	case LMTP_WANT_DOT:
+		r = fstrstr (in, &datares);
+		break;
 	}
 
 	return r != -1;
@@ -299,104 +299,102 @@ close_mta_connection (struct mta_callback_data *cd, gboolean is_success)
 /*
  * Callback that is called when there is data to read in buffer
  */
-static gboolean
-mta_read_socket (f_str_t *in, void *arg)
+static                          gboolean
+mta_read_socket (f_str_t * in, void *arg)
 {
-	struct mta_callback_data *cd = (struct mta_callback_data *)arg;
-	char outbuf[1024], *hostbuf, *c;
-	int hostmax, r;
-	GList *cur;
-	static f_str_t contres1 = {
+	struct mta_callback_data       *cd = (struct mta_callback_data *)arg;
+	char                            outbuf[1024], *hostbuf, *c;
+	int                             hostmax, r;
+	GList                          *cur;
+	static f_str_t                  contres1 = {
 		.begin = "250-",
 		.len = sizeof ("250-") - 1,
-	},
-	contres2 = {
-		.begin = "220-",
-		.len = sizeof ("220-") - 1,
-	};
-	
+	}
+	, contres2 = {
+	.begin = "220-",.len = sizeof ("220-") - 1,};
+
 	if (fstrstr (in, &contres1) != -1 || fstrstr (in, &contres2) != -1) {
 		/* Skip such lines */
 		return TRUE;
 	}
 
 	switch (cd->state) {
-		case LMTP_WANT_GREETING:
-			if (!parse_mta_str (in, cd)) {
-				msg_warn ("mta_read_socket: got bad greeting");
-				close_mta_connection (cd, FALSE);
-				return FALSE;
-			}
-			hostmax = sysconf (_SC_HOST_NAME_MAX) + 1;
-			hostbuf = alloca (hostmax);
-			gethostname (hostbuf, hostmax);
-			hostbuf[hostmax - 1] = '\0';
-			if (cd->task->cfg->deliver_lmtp) {
-				r = snprintf (outbuf, sizeof (outbuf), "LHLO %s" CRLF, hostbuf); 
-			}
-			else {
-				r = snprintf (outbuf, sizeof (outbuf), "HELO %s" CRLF, hostbuf); 
-			}
-			rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
-			cd->state = LMTP_WANT_MAIL;
-			break;
-		case LMTP_WANT_MAIL:
-			if (!parse_mta_str (in, cd)) {
-				msg_warn ("mta_read_socket: got bad helo");
-				close_mta_connection (cd, FALSE);
-				return FALSE;
-			}
-			r = snprintf (outbuf, sizeof (outbuf), "MAIL FROM: <%s>" CRLF, cd->task->from);
-			rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
-			cd->state = LMTP_WANT_RCPT;
-			break;
-		case LMTP_WANT_RCPT:
-			if (!parse_mta_str (in, cd)) {
-				msg_warn ("mta_read_socket: got bad mail from");
-				close_mta_connection (cd, FALSE);
-				return FALSE;
-			}
-			cur = g_list_first (cd->task->rcpt);
-			r = 0;
-			while (cur) {
-				r += snprintf (outbuf + r, sizeof (outbuf) -r, "RCPT TO: <%s>" CRLF, (char *)cur->data);
-				cur = g_list_next (cur);
-			}
+	case LMTP_WANT_GREETING:
+		if (!parse_mta_str (in, cd)) {
+			msg_warn ("mta_read_socket: got bad greeting");
+			close_mta_connection (cd, FALSE);
+			return FALSE;
+		}
+		hostmax = sysconf (_SC_HOST_NAME_MAX) + 1;
+		hostbuf = alloca (hostmax);
+		gethostname (hostbuf, hostmax);
+		hostbuf[hostmax - 1] = '\0';
+		if (cd->task->cfg->deliver_lmtp) {
+			r = snprintf (outbuf, sizeof (outbuf), "LHLO %s" CRLF, hostbuf);
+		}
+		else {
+			r = snprintf (outbuf, sizeof (outbuf), "HELO %s" CRLF, hostbuf);
+		}
+		rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
+		cd->state = LMTP_WANT_MAIL;
+		break;
+	case LMTP_WANT_MAIL:
+		if (!parse_mta_str (in, cd)) {
+			msg_warn ("mta_read_socket: got bad helo");
+			close_mta_connection (cd, FALSE);
+			return FALSE;
+		}
+		r = snprintf (outbuf, sizeof (outbuf), "MAIL FROM: <%s>" CRLF, cd->task->from);
+		rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
+		cd->state = LMTP_WANT_RCPT;
+		break;
+	case LMTP_WANT_RCPT:
+		if (!parse_mta_str (in, cd)) {
+			msg_warn ("mta_read_socket: got bad mail from");
+			close_mta_connection (cd, FALSE);
+			return FALSE;
+		}
+		cur = g_list_first (cd->task->rcpt);
+		r = 0;
+		while (cur) {
+			r += snprintf (outbuf + r, sizeof (outbuf) - r, "RCPT TO: <%s>" CRLF, (char *)cur->data);
+			cur = g_list_next (cur);
+		}
 
-			rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
-			cd->state = LMTP_WANT_DATA;
-			break;
-		case LMTP_WANT_DATA:
-			if (!parse_mta_str (in, cd)) {
-				msg_warn ("mta_read_socket: got bad rcpt");
-				close_mta_connection (cd, FALSE);
-				return FALSE;
-			}
-			r = snprintf (outbuf, sizeof (outbuf), "DATA" CRLF);
-			rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
-			cd->state = LMTP_WANT_DOT;
-			break;
-		case LMTP_WANT_DOT:
-			if (!parse_mta_str (in, cd)) {
-				msg_warn ("mta_read_socket: got bad data");
-				close_mta_connection (cd, FALSE);
-				return FALSE;
-			}
-			c = g_mime_object_to_string ((GMimeObject *)cd->task->message);
-			r = strlen (c);
-			rspamd_dispatcher_write (cd->task->dispatcher, c, r, TRUE, TRUE);
-			memory_pool_add_destructor (cd->task->task_pool, (pool_destruct_func)g_free, c);
-			r = snprintf (outbuf, sizeof (outbuf), CRLF "." CRLF);
-			rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
-			cd->state = LMTP_WANT_CLOSING;
-		case LMTP_WANT_CLOSING:
-			if (!parse_mta_str (in, cd)) {
-				msg_warn ("mta_read_socket: message not delivered");
-				close_mta_connection (cd, FALSE);
-				return FALSE;
-			}
-			close_mta_connection (cd, TRUE);
-			break;
+		rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
+		cd->state = LMTP_WANT_DATA;
+		break;
+	case LMTP_WANT_DATA:
+		if (!parse_mta_str (in, cd)) {
+			msg_warn ("mta_read_socket: got bad rcpt");
+			close_mta_connection (cd, FALSE);
+			return FALSE;
+		}
+		r = snprintf (outbuf, sizeof (outbuf), "DATA" CRLF);
+		rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
+		cd->state = LMTP_WANT_DOT;
+		break;
+	case LMTP_WANT_DOT:
+		if (!parse_mta_str (in, cd)) {
+			msg_warn ("mta_read_socket: got bad data");
+			close_mta_connection (cd, FALSE);
+			return FALSE;
+		}
+		c = g_mime_object_to_string ((GMimeObject *) cd->task->message);
+		r = strlen (c);
+		rspamd_dispatcher_write (cd->task->dispatcher, c, r, TRUE, TRUE);
+		memory_pool_add_destructor (cd->task->task_pool, (pool_destruct_func) g_free, c);
+		r = snprintf (outbuf, sizeof (outbuf), CRLF "." CRLF);
+		rspamd_dispatcher_write (cd->task->dispatcher, outbuf, r, FALSE, FALSE);
+		cd->state = LMTP_WANT_CLOSING;
+	case LMTP_WANT_CLOSING:
+		if (!parse_mta_str (in, cd)) {
+			msg_warn ("mta_read_socket: message not delivered");
+			close_mta_connection (cd, FALSE);
+			return FALSE;
+		}
+		close_mta_connection (cd, TRUE);
+		break;
 	}
 
 	return TRUE;
@@ -406,9 +404,9 @@ mta_read_socket (f_str_t *in, void *arg)
  * Called if something goes wrong
  */
 static void
-mta_err_socket (GError *err, void *arg)
+mta_err_socket (GError * err, void *arg)
 {
-	struct mta_callback_data *cd = (struct mta_callback_data *)arg;
+	struct mta_callback_data       *cd = (struct mta_callback_data *)arg;
 	msg_info ("mta_err_socket: abnormaly terminating connection with MTA");
 	close_mta_connection (cd, FALSE);
 }
@@ -419,10 +417,10 @@ mta_err_socket (GError *err, void *arg)
 static int
 lmtp_deliver_mta (struct worker_task *task)
 {
-	int sock;
-	struct sockaddr_un *un;
-	struct mta_callback_data *cd;
-	
+	int                             sock;
+	struct sockaddr_un             *un;
+	struct mta_callback_data       *cd;
+
 	if (task->cfg->deliver_family == AF_UNIX) {
 		un = alloca (sizeof (struct sockaddr_un));
 		sock = make_unix_socket (task->cfg->deliver_host, un, FALSE);
@@ -433,94 +431,92 @@ lmtp_deliver_mta (struct worker_task *task)
 	if (sock == -1) {
 		msg_warn ("lmtp_deliver_mta: cannot create socket for %s, %s", task->cfg->deliver_host, strerror (errno));
 	}
-	
+
 	cd = memory_pool_alloc (task->task_pool, sizeof (struct mta_callback_data));
 	cd->task = task;
 	cd->state = LMTP_WANT_GREETING;
-	cd->dispatcher = rspamd_create_dispatcher (sock, BUFFER_LINE, mta_read_socket,
-														NULL, mta_err_socket, NULL,
-														(void *)cd);
+	cd->dispatcher = rspamd_create_dispatcher (sock, BUFFER_LINE, mta_read_socket, NULL, mta_err_socket, NULL, (void *)cd);
 	return 0;
 }
 
-static char*
+static char                    *
 format_lda_args (struct worker_task *task)
 {
-	char *res, *c, *r;
-	size_t len;
-	GList *rcpt;
-	gboolean got_args = FALSE;
+	char                           *res, *c, *r;
+	size_t                          len;
+	GList                          *rcpt;
+	gboolean                        got_args = FALSE;
 
 	c = task->cfg->deliver_agent_path;
 	/* Find first arg */
 	if ((c = strchr (c, ' ')) == NULL) {
 		return task->cfg->deliver_agent_path;
 	}
-	
+
 	/* Calculate length of result string */
 	len = strlen (task->cfg->deliver_agent_path);
 	while (*c) {
 		if (*c == '%') {
 			c++;
 			switch (*c) {
-				case 'f':
-					/* Insert from */
-					len += strlen (task->from) - 2;
-					break;
-				case 'r':
-					/* Insert list of recipients */
-					rcpt = g_list_first (task->rcpt);
-					len -= 2;
-					while (rcpt) {
-						len += strlen ((char *)rcpt->data) + 1;
-						rcpt = g_list_next (rcpt);
-					}
-					break;
+			case 'f':
+				/* Insert from */
+				len += strlen (task->from) - 2;
+				break;
+			case 'r':
+				/* Insert list of recipients */
+				rcpt = g_list_first (task->rcpt);
+				len -= 2;
+				while (rcpt) {
+					len += strlen ((char *)rcpt->data) + 1;
+					rcpt = g_list_next (rcpt);
+				}
+				break;
 			}
 		}
-		c ++;
-		len ++;
+		c++;
+		len++;
 	}
 	res = memory_pool_alloc (task->task_pool, len + 1);
 	r = res;
 	c = task->cfg->deliver_agent_path;
-	
+
 	while (*c) {
 		if (*c == ' ') {
 			got_args = TRUE;
 		}
 		if (got_args && *c == '%') {
 			switch (*(c + 1)) {
-				case 'f':
-					/* Insert from */
-					c += 2;
-					len = strlen (task->from);
-					memcpy (r, task->from, len);
+			case 'f':
+				/* Insert from */
+				c += 2;
+				len = strlen (task->from);
+				memcpy (r, task->from, len);
+				r += len;
+				break;
+			case 'r':
+				/* Insert list of recipients */
+				c += 2;
+				rcpt = g_list_first (task->rcpt);
+				while (rcpt) {
+					len = strlen ((char *)rcpt->data) + 1;
+					memcpy (r, rcpt->data, len);
 					r += len;
-					break;
-				case 'r':
-					/* Insert list of recipients */
-					c += 2;
-					rcpt = g_list_first (task->rcpt);
-					while (rcpt) {
-						len = strlen ((char *)rcpt->data) + 1;
-						memcpy (r, rcpt->data, len);
-						r += len;
-						*r++ = ' ';
-						rcpt = g_list_next (rcpt);
-					}
-					break;
-				default:
-					*r = *c;
-					r ++;
-					c ++;
-					break;
+					*r++ = ' ';
+					rcpt = g_list_next (rcpt);
+				}
+				break;
+			default:
+				*r = *c;
+				r++;
+				c++;
+				break;
 			}
 		}
 		else {
 			*r = *c;
-			r ++;
-			c ++;
+			r++;
+			c++;
 		}
 	}
 
@@ -530,15 +526,15 @@ format_lda_args (struct worker_task *task)
 static int
 lmtp_deliver_lda (struct worker_task *task)
 {
-	char *args, **argv;
-	GMimeStream *stream;
-	int rc, ecode, p[2], argc;
-	pid_t cpid, pid;
+	char                           *args, **argv;
+	GMimeStream                    *stream;
+	int                             rc, ecode, p[2], argc;
+	pid_t                           cpid, pid;
 
 	if ((args = format_lda_args (task)) == NULL) {
 		return -1;
 	}
-	
+
 	/* Format arguments in shell style */
 	if (!g_shell_parse_argv (args, &argc, &argv, NULL)) {
 		msg_info ("lmtp_deliver_lda: cannot parse arguments");
@@ -550,7 +546,7 @@ lmtp_deliver_lda (struct worker_task *task)
 		msg_info ("lmtp_deliver_lda: cannot open pipe: %s", strerror (errno));
 		return -1;
 	}
-	
+
 	/* Fork to exec LDA */
 #ifdef HAVE_VFORK
 	if ((cpid = vfork ()) == -1) {
@@ -558,7 +554,7 @@ lmtp_deliver_lda (struct worker_task *task)
 		msg_info ("lmtp_deliver_lda: cannot fork: %s", strerror (errno));
 		return -1;
 	}
-#else 
+#else
 	if ((cpid = fork ()) == -1) {
 		g_strfreev (argv);
 		msg_info ("lmtp_deliver_lda: cannot fork: %s", strerror (errno));
@@ -571,18 +567,18 @@ lmtp_deliver_lda (struct worker_task *task)
 		close (p[1]);
 		/* Set standart IO descriptors */
 		if (p[0] != STDIN_FILENO) {
-			(void)dup2(p[0], STDIN_FILENO);
-			(void)close(p[0]);
+			(void)dup2 (p[0], STDIN_FILENO);
+			(void)close (p[0]);
 		}
 
 		execv (argv[0], argv);
 		_exit (127);
 	}
-	
+
 	close (p[0]);
 	stream = g_mime_stream_fs_new (p[1]);
 
-	if (g_mime_object_write_to_stream ((GMimeObject *)task->message, stream) == -1) {
+	if (g_mime_object_write_to_stream ((GMimeObject *) task->message, stream) == -1) {
 		g_strfreev (argv);
 		msg_info ("lmtp_deliver_lda: cannot write stream to lda");
 		return -1;
@@ -593,14 +589,14 @@ lmtp_deliver_lda (struct worker_task *task)
 
 #if defined(HAVE_WAIT4)
 	do {
-		pid = wait4(cpid, &rc, 0, NULL);
+		pid = wait4 (cpid, &rc, 0, NULL);
 	} while (pid == -1 && errno == EINTR);
 #elif defined(HAVE_WAITPID)
 	do {
-		pid = waitpid(cpid, &rc, 0);
+		pid = waitpid (cpid, &rc, 0);
 	} while (pid == -1 && errno == EINTR);
 #else
-#error wait mechanisms are undefined
+#   error wait mechanisms are undefined
 #endif
 	if (rc == -1) {
 		g_strfreev (argv);
@@ -640,7 +636,7 @@ lmtp_deliver_message (struct worker_task *task)
 int
 write_lmtp_reply (struct rspamd_lmtp_proto *lmtp)
 {
-	int r;
+	int                             r;
 
 	msg_debug ("write_lmtp_reply: writing reply to client");
 	if (lmtp->task->error_code != 0) {