--- a/src/smtp_in.c	Mon Oct 27 16:21:27 2008 +0100
+++ b/src/smtp_in.c	Mon Oct 27 16:23:10 2008 +0100
@@ -30,329 +30,329 @@
 
 #ifdef ENABLE_SMTP_SERVER
 
-smtp_cmd smtp_cmds[] =
-{
-  { SMTP_HELO, "HELO", },
-  { SMTP_EHLO, "EHLO", },
-  { SMTP_MAIL_FROM, "MAIL FROM:", },
-  { SMTP_RCPT_TO, "RCPT TO:", },
-  { SMTP_DATA, "DATA", },
-  { SMTP_QUIT, "QUIT", },
-  { SMTP_RSET, "RSET", },
-  { SMTP_NOOP, "NOOP", },
-  { SMTP_HELP, "HELP" },
+smtp_cmd smtp_cmds[] = {
+	{SMTP_HELO, "HELO",}
+	,
+	{SMTP_EHLO, "EHLO",}
+	,
+	{SMTP_MAIL_FROM, "MAIL FROM:",}
+	,
+	{SMTP_RCPT_TO, "RCPT TO:",}
+	,
+	{SMTP_DATA, "DATA",}
+	,
+	{SMTP_QUIT, "QUIT",}
+	,
+	{SMTP_RSET, "RSET",}
+	,
+	{SMTP_NOOP, "NOOP",}
+	,
+	{SMTP_HELP, "HELP"}
+	,
 };
 
-static
-smtp_cmd_id get_id(const gchar *line)
+static smtp_cmd_id
+get_id(const gchar * line)
 {
-  gint i;
-  for(i = 0; i < SMTP_NUM_IDS; i++){
-    if(strncasecmp(smtp_cmds[i].cmd, line, strlen(smtp_cmds[i].cmd)) == 0)
-      return (smtp_cmd_id)i;
-  }
-  return SMTP_ERROR;
+	gint i;
+	for (i = 0; i < SMTP_NUM_IDS; i++) {
+		if (strncasecmp(smtp_cmds[i].cmd, line, strlen(smtp_cmds[i].cmd)) == 0)
+			return (smtp_cmd_id) i;
+	}
+	return SMTP_ERROR;
 }
 
 /* this is a quick hack: we expect the address to be syntactically correct
    and containing the mailbox only:
 */
 
-static
-gboolean get_address(gchar *line, gchar *addr)
+static gboolean
+get_address(gchar * line, gchar * addr)
 {
-  gchar *p = line, *q = addr;
+	gchar *p = line, *q = addr;
 
-  /* skip MAIL FROM: and RCPT TO: */
-  while(*p && (*p != ':')) p++;
-  p++;
-
-  /* skip spaces: */
-  while(*p && isspace(*p)) p++;
-
-  /* get address: */
-  while(*p && !isspace(*p) && (q < addr+MAX_ADDRESS-1)) *(q++) = *(p++);
-  *q = 0;
+	/* skip MAIL FROM: and RCPT TO: */
+	while (*p && (*p != ':'))
+		p++;
+	p++;
 
-  return TRUE;
-}
-
-static
-smtp_connection *create_base(gchar *remote_host)
-{
-  smtp_connection *base = g_malloc(sizeof(smtp_connection));
-  if(base){
-    base->remote_host = g_strdup(remote_host);
+	/* skip spaces: */
+	while (*p && isspace(*p))
+		p++;
 
-    base->prot = PROT_SMTP;
-    base->next_id = 0;
-    base->helo_seen = 0;
-    base->from_seen = 0;
-    base->rcpt_seen = 0;
-    base->msg = NULL;
+	/* get address: */
+	while (*p && !isspace(*p) && (q < addr + MAX_ADDRESS - 1))
+		*(q++) = *(p++);
+	*q = 0;
 
-    return base;
-  }
-  return NULL;
+	return TRUE;
 }
 
-static
-void smtp_printf(FILE *out, gchar *fmt, ...)
+static smtp_connection*
+create_base(gchar * remote_host)
 {
-  va_list args;
-  va_start(args, fmt);
-
-  DEBUG(4){
-    gchar buf[256];
-    va_list args_copy;
+	smtp_connection *base = g_malloc(sizeof(smtp_connection));
+	if (base) {
+		base->remote_host = g_strdup(remote_host);
 
-    va_copy(args_copy, args);
-    vsnprintf(buf, 255, fmt, args_copy);
-    va_end(args_copy);
+		base->prot = PROT_SMTP;
+		base->next_id = 0;
+		base->helo_seen = 0;
+		base->from_seen = 0;
+		base->rcpt_seen = 0;
+		base->msg = NULL;
 
-    debugf(">>>%s", buf);
-  }
-
-  vfprintf(out, fmt, args);  fflush(out);
-
-  va_end(args);
+		return base;
+	}
+	return NULL;
 }
 
-void smtp_in(FILE *in, FILE *out, gchar *remote_host, gchar *ident)
+static void
+smtp_printf(FILE * out, gchar * fmt, ...)
 {
-  gchar *buffer;
-  smtp_cmd_id cmd_id;
-  message *msg = NULL;
-  smtp_connection *psc;
-  int len;
-
-  DEBUG(5) debugf("smtp_in entered, remote_host = %s\n", remote_host);
-
-  psc = create_base(remote_host);
-  psc->msg = msg;
+	va_list args;
+	va_start(args, fmt);
 
-  buffer = (gchar *)g_malloc(BUF_LEN);
-  if(buffer){
-    /* send greeting string, containing ESMTP: */
-    smtp_printf(out, "220 %s MasqMail %s ESMTP\r\n",
-		conf.host_name, VERSION);
-    
-    while((len = read_sockline(in, buffer, BUF_LEN, 5*60, READSOCKL_CHUG)) >= 0){
-      cmd_id = get_id(buffer);
-      
-      switch(cmd_id){
-      case SMTP_EHLO:
-	psc->prot = PROT_ESMTP;
-	/* fall through */
-      case SMTP_HELO:
-	psc->helo_seen = TRUE;
+	DEBUG(4) {
+		gchar buf[256];
+		va_list args_copy;
 
-	if(!conf.defer_all){ /* I need this to debug delivery failures */
-	  if(psc->prot == PROT_ESMTP){
-	    smtp_printf(out, "250-%s Nice to meet you with ESMTP\r\n",
-			conf.host_name);
-	    /* not yet: fprintf(out, "250-SIZE\r\n"); */
-	    smtp_printf(out,
-			"250-PIPELINING\r\n"
-			"250 HELP\r\n");
-	  }else{
-	    smtp_printf(out, "250 %s pretty old mailer, huh?\r\n",
-			conf.host_name);
-	  }
-	  break;
-	}else{
-	  smtp_printf(out, "421 %s service temporarily unavailable.\r\n",
-		      conf.host_name);
+		va_copy(args_copy, args);
+		vsnprintf(buf, 255, fmt, args_copy);
+		va_end(args_copy);
+
+		debugf(">>>%s", buf);
 	}
 
-      case SMTP_MAIL_FROM:
-	if(psc->helo_seen && !psc->from_seen){
-	  gchar buf[MAX_ADDRESS];
-	  address *addr;
+	vfprintf(out, fmt, args);
+	fflush(out);
+
+	va_end(args);
+}
 
-	  msg = create_message();
-	  msg->received_host = remote_host ? g_strdup(remote_host) : NULL;
-	  msg->received_prot = psc->prot;
-	  msg->ident = ident ? g_strdup(ident) : NULL;
-	  /* get transfer id and increment for next one */
-	  msg->transfer_id = (psc->next_id)++;
+void
+smtp_in(FILE * in, FILE * out, gchar * remote_host, gchar * ident)
+{
+	gchar *buffer;
+	smtp_cmd_id cmd_id;
+	message *msg = NULL;
+	smtp_connection *psc;
+	int len;
+
+	DEBUG(5) debugf("smtp_in entered, remote_host = %s\n", remote_host);
 
-	  get_address(buffer, buf);
-	  if((addr = remote_host ?
-	     create_address(buf, TRUE) :
-	      create_address_qualified(buf, TRUE, conf.host_name))){
-	    if(addr->domain != NULL){
-	      psc->from_seen = TRUE;
-	      msg->return_path = addr;
-		smtp_printf(out, "250 OK %s is a nice guy.\r\n", addr->address);
-	    }else{
-	      smtp_printf(out,
-			  "501 return path must be qualified.\r\n", buf);
-	    }
-	  }else{
-	    smtp_printf(out, "501 %s: syntax error.\r\n", buf);
-	  }
-	}else{
-	  if(!psc->helo_seen)
-	    smtp_printf(out, "503 need HELO or EHLO\r\n");
-	  else
-	    smtp_printf(out, "503 MAIL FROM: already given.\r\n");
-	}
-	break;
+	psc = create_base(remote_host);
+	psc->msg = msg;
+
+	buffer = (gchar *) g_malloc(BUF_LEN);
+	if (buffer) {
+		/* send greeting string, containing ESMTP: */
+		smtp_printf(out, "220 %s MasqMail %s ESMTP\r\n", conf.host_name, VERSION);
 
-      case SMTP_RCPT_TO:
+		while ((len = read_sockline(in, buffer, BUF_LEN, 5 * 60, READSOCKL_CHUG)) >= 0) {
+			cmd_id = get_id(buffer);
 
-	if(psc->helo_seen && psc->from_seen){
-	  char buf[MAX_ADDRESS];
-	  address *addr;
+			switch (cmd_id) {
+			case SMTP_EHLO:
+				psc->prot = PROT_ESMTP;
+				/* fall through */
+			case SMTP_HELO:
+				psc->helo_seen = TRUE;
 
-	  get_address(buffer, buf);
-	  if((addr = remote_host ?
-	      create_address(buf, TRUE) :
-	      create_address_qualified(buf, TRUE, conf.host_name))){
-	    if(addr->local_part[0] != '|'){
-	      if(addr->domain != NULL){
-		gboolean do_relay = conf.do_relay;
-		if(!do_relay){
-		  if((do_relay = addr_is_local(msg->return_path)));
-		  if(!do_relay){
-		    do_relay = addr_is_local(addr);
-		  }
-		}
-		if(do_relay){
-		  psc->rcpt_seen = TRUE;
-		  msg->rcpt_list = g_list_append(msg->rcpt_list, addr);
-		  smtp_printf(out, "250 OK %s is our friend.\r\n", addr->address);
-		}else{
-		  smtp_printf(out, "550 relaying to %s denied.\r\n",
-			      addr_string(addr));
-		}
-	      }else{
-		smtp_printf(out,
-			    "501 recipient address must be qualified.\r\n", buf);
-	      }
-	    }else
-	      smtp_printf(out, "501 %s: no pipe allowed for SMTP connections\r\n", buf);
-	  }else{
-	    smtp_printf(out, "501 %s: syntax error in address.\r\n", buf);
-	  }
-	}else{
+				if (!conf.defer_all) {  /* I need this to debug delivery failures */
+					if (psc->prot == PROT_ESMTP) {
+						smtp_printf(out, "250-%s Nice to meet you with ESMTP\r\n", conf.host_name);
+						/* not yet: fprintf(out, "250-SIZE\r\n"); */
+						smtp_printf(out, "250-PIPELINING\r\n" "250 HELP\r\n");
+					} else {
+						smtp_printf(out, "250 %s pretty old mailer, huh?\r\n", conf.host_name);
+					}
+					break;
+				} else {
+					smtp_printf(out, "421 %s service temporarily unavailable.\r\n", conf.host_name);
+				}
+
+			case SMTP_MAIL_FROM:
+				if (psc->helo_seen && !psc->from_seen) {
+					gchar buf[MAX_ADDRESS];
+					address *addr;
+
+					msg = create_message();
+					msg->received_host = remote_host ? g_strdup(remote_host) : NULL;
+					msg->received_prot = psc->prot;
+					msg->ident = ident ? g_strdup(ident) : NULL;
+					/* get transfer id and increment for next one */
+					msg->transfer_id = (psc->next_id)++;
 
-	  if(!psc->helo_seen)
-	    smtp_printf(out, "503 need HELO or EHLO.\r\n");
-	  else
-	    smtp_printf(out, "503 need MAIL FROM: before RCPT TO:\r\n");
-	}
-	break;
-	  
-      case SMTP_DATA:
-	if(psc->helo_seen && psc->rcpt_seen){
-	  accept_error err;
+					get_address(buffer, buf);
+					if ((addr = remote_host
+					    ? create_address(buf, TRUE)
+					    : create_address_qualified(buf, TRUE, conf.host_name))) {
+						if (addr->domain != NULL) {
+							psc->from_seen = TRUE;
+							msg->return_path = addr;
+							smtp_printf(out, "250 OK %s is a nice guy.\r\n", addr->address);
+						} else {
+							smtp_printf(out, "501 return path must be qualified.\r\n", buf);
+						}
+					} else {
+						smtp_printf(out, "501 %s: syntax error.\r\n", buf);
+					}
+				} else {
+					if (!psc->helo_seen)
+						smtp_printf(out, "503 need HELO or EHLO\r\n");
+					else
+						smtp_printf(out, "503 MAIL FROM: already given.\r\n");
+				}
+				break;
 
-	  smtp_printf(out, "354 okay, and do not forget the dot\r\n");
+			case SMTP_RCPT_TO:
+
+				if (psc->helo_seen && psc->from_seen) {
+					char buf[MAX_ADDRESS];
+					address *addr;
 
-	  if((err = accept_message(in, msg, conf.do_save_envelope_to ? ACC_SAVE_ENVELOPE_TO : 0))
-	     == AERR_OK){
-	    if(spool_write(msg, TRUE)){
-	      pid_t pid;
-	      smtp_printf(out, "250 OK id=%s\r\n", msg->uid);
-	      
-	      if(remote_host != NULL)
-		logwrite(LOG_NOTICE, "%s <= <%s@%s> host=%s with %s\n",
-			 msg->uid, msg->return_path->local_part,
-			 msg->return_path->domain, remote_host,
-			 prot_names[psc->prot]);
-	      else
-		logwrite(LOG_NOTICE, "%s <= <%s@%s> with %s\n",
-			 msg->uid, msg->return_path->local_part,
-			 msg->return_path->domain,
-			 prot_names[psc->prot]);
-	      
-	      if(!conf.do_queue){
-		if((pid = fork()) == 0){
-		  
-		  if(deliver(msg))
-		    _exit(EXIT_SUCCESS);
-		  else
-		    _exit(EXIT_FAILURE);
-		  
-		}else if(pid < 0){
-		  logwrite(LOG_ALERT, "could not fork for delivery, id = %s",
-			   msg->uid);
+					get_address(buffer, buf);
+					if ((addr = remote_host
+					    ? create_address(buf, TRUE)
+					    : create_address_qualified(buf, TRUE, conf.host_name))) {
+						if (addr->local_part[0] != '|') {
+							if (addr->domain != NULL) {
+								gboolean do_relay = conf.do_relay;
+								if (!do_relay) {
+									if ((do_relay = addr_is_local(msg->return_path))) {
+									}
+									if (!do_relay) {
+										do_relay = addr_is_local(addr);
+									}
+								}
+								if (do_relay) {
+									psc->rcpt_seen = TRUE;
+									msg->rcpt_list = g_list_append(msg->rcpt_list, addr);
+									smtp_printf(out, "250 OK %s is our friend.\r\n", addr->address);
+								} else {
+									smtp_printf(out, "550 relaying to %s denied.\r\n", addr_string(addr));
+								}
+							} else {
+								smtp_printf(out, "501 recipient address must be qualified.\r\n", buf);
+							}
+						} else
+							smtp_printf(out, "501 %s: no pipe allowed for SMTP connections\r\n", buf);
+					} else {
+						smtp_printf(out, "501 %s: syntax error in address.\r\n", buf);
+					}
+				} else {
+
+					if (!psc->helo_seen)
+						smtp_printf(out, "503 need HELO or EHLO.\r\n");
+					else
+						smtp_printf(out, "503 need MAIL FROM: before RCPT TO:\r\n");
+				}
+				break;
+
+			case SMTP_DATA:
+				if (psc->helo_seen && psc->rcpt_seen) {
+					accept_error err;
+
+					smtp_printf(out, "354 okay, and do not forget the dot\r\n");
+
+					if ((err = accept_message(in, msg, conf.do_save_envelope_to ? ACC_SAVE_ENVELOPE_TO : 0)) == AERR_OK) {
+						if (spool_write(msg, TRUE)) {
+							pid_t pid;
+							smtp_printf(out, "250 OK id=%s\r\n", msg->uid);
+
+							if (remote_host != NULL)
+								logwrite(LOG_NOTICE, "%s <= <%s@%s> host=%s with %s\n", msg->uid, msg->return_path->local_part,
+								         msg->return_path->domain, remote_host, prot_names[psc->prot]);
+							else
+								logwrite(LOG_NOTICE, "%s <= <%s@%s> with %s\n", msg->uid, msg->return_path->local_part,
+								         msg->return_path->domain, prot_names[psc->prot]);
+
+							if (!conf.do_queue) {
+								if ((pid = fork()) == 0) {
+
+									if (deliver(msg))
+										_exit(EXIT_SUCCESS);
+									else
+										_exit(EXIT_FAILURE);
+
+								} else if (pid < 0) {
+									logwrite(LOG_ALERT, "could not fork for delivery, id = %s", msg->uid);
+								}
+							} else {
+								DEBUG(1) debugf("queuing forced by configuration or option.\n");
+							}
+						} else {
+							smtp_printf(out, "451 Could not write spool file\r\n");
+							return;
+						}
+					} else {
+						switch (err) {
+						case AERR_TIMEOUT:
+							return;
+						case AERR_EOF:
+							return;
+						default:
+							/* should never happen: */
+							smtp_printf(out, "451 Unknown error\r\n");
+							return;
+						}
+					}
+					psc->rcpt_seen = psc->from_seen = FALSE;
+					destroy_message(msg);
+					msg = NULL;
+				} else {
+					if (!psc->helo_seen)
+						smtp_printf(out, "503 need HELO or EHLO.\r\n");
+					else
+						smtp_printf(out, "503 need RCPT TO: before DATA\r\n");
+				}
+				break;
+			case SMTP_QUIT:
+				smtp_printf(out, "221 goodbye\r\n");
+				if (msg != NULL)
+					destroy_message(msg);
+				return;
+			case SMTP_RSET:
+				psc->from_seen = psc->rcpt_seen = FALSE;
+				if (msg != NULL)
+					destroy_message(msg);
+				msg = NULL;
+				smtp_printf(out, "250 OK\r\n");
+				break;
+			case SMTP_NOOP:
+				smtp_printf(out, "250 OK\r\n");
+				break;
+			case SMTP_HELP:
+				{
+					int i;
+
+					smtp_printf(out, "214-supported commands:\r\n");
+					for (i = 0; i < SMTP_NUM_IDS - 1; i++) {
+						smtp_printf(out, "214-%s\r\n", smtp_cmds[i].cmd);
+					}
+					smtp_printf(out, "214 %s\r\n", smtp_cmds[i].cmd);
+				}
+				break;
+			default:
+				smtp_printf(out, "501 command not recognized\r\n");
+				DEBUG(1) debugf("command not recognized, was '%s'\n", buffer);
+				break;
+			}
 		}
-	      }else{
-		DEBUG(1) debugf("queuing forced by configuration or option.\n");
-	      }
-	    }else{
-	      smtp_printf(out, "451 Could not write spool file\r\n");
-	      return;
-	    }
-	  }else{
-	    switch(err){
-	    case AERR_TIMEOUT:
-	      return;
-	    case AERR_EOF:
-	      return;
-	    default:
-	      /* should never happen: */
-	      smtp_printf(out, "451 Unknown error\r\n");
-	      return;
-	    }
-	  }
-	  psc->rcpt_seen = psc->from_seen = FALSE;
-	  destroy_message(msg);
-	  msg = NULL;
-	}else{
-	  if(!psc->helo_seen)
-	    smtp_printf(out, "503 need HELO or EHLO.\r\n");
-	  else
-	    smtp_printf(out, "503 need RCPT TO: before DATA\r\n");
+		switch (len) {
+		case -3:
+			logwrite(LOG_NOTICE, "connection timed out\n");
+			break;
+		case -2:
+			logwrite(LOG_NOTICE, "line overflow\n");
+			break;
+		case -1:
+			logwrite(LOG_NOTICE, "received EOF\n");
+			break;
+		default:
+			break;
+		}
 	}
-	break;
-      case SMTP_QUIT:
-	smtp_printf(out, "221 goodbye\r\n");
-	if(msg != NULL) destroy_message(msg);
-	return;
-      case SMTP_RSET:
-	psc->from_seen = psc->rcpt_seen = FALSE;
-	if(msg != NULL)
-	  destroy_message(msg);
-	msg = NULL;
-	smtp_printf(out, "250 OK\r\n");
-	break;
-      case SMTP_NOOP:
-	smtp_printf(out, "250 OK\r\n");
-	break;
-      case SMTP_HELP:
-	{
-	  int i;
-
-	  smtp_printf(out, "214-supported commands:\r\n");
-	  for(i = 0; i < SMTP_NUM_IDS-1; i++){
-	    smtp_printf(out, "214-%s\r\n", smtp_cmds[i].cmd);
-	  }
-	  smtp_printf(out, "214 %s\r\n", smtp_cmds[i].cmd);
-	}
-	break;
-      default:
-	smtp_printf(out, "501 command not recognized\r\n");
-	DEBUG(1) debugf("command not recognized, was '%s'\n", buffer);
-	break;
-      }
-    }
-    switch(len){
-    case -3:
-      logwrite(LOG_NOTICE, "connection timed out\n");
-      break;
-    case -2:
-      logwrite(LOG_NOTICE, "line overflow\n");
-      break;
-    case -1:
-      logwrite(LOG_NOTICE, "received EOF\n");
-      break;
-    default:
-      break;
-    }
-  }
 }
 #endif