remove trailing whitespace

ok sunil gilles

15 files changed, 46 insertions, 46 deletions

diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c
index c246c4b1c10..bf2ea9d5688 100644
--- a/usr.sbin/smtpd/bounce.c
+++ b/usr.sbin/smtpd/bounce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bounce.c,v 1.68 2015/11/23 06:54:21 sunil Exp $	*/
+/*	$OpenBSD: bounce.c,v 1.69 2015/12/14 10:22:11 jung Exp $	*/
 
 /*
  * Copyright (c) 2009 Gilles Chehade <gilles@poolp.org>
@@ -389,7 +389,7 @@ bounce_next_message(struct bounce_session *s)
 	if ((fd = queue_message_fd_r(msg->msgid)) == -1) {
 		bounce_delivery(msg, IMSG_QUEUE_DELIVERY_TEMPFAIL,
 		    "Could not open message fd");
-		goto again;		
+		goto again;
 	}
 
 	if ((s->msgfp = fdopen(fd, "r")) == NULL) {
@@ -808,7 +808,7 @@ action_str(const struct delivery_bounce *b)
 	case B_DSN:
 		if (b->mta_without_dsn)
 			return ("relayed");
-		
+
 		return ("success");
 	default:
 		log_warn("warn: bounce: unknown bounce_type");
diff --git a/usr.sbin/smtpd/compress_gzip.c b/usr.sbin/smtpd/compress_gzip.c
index c0a85d03d74..f71a6cf3287 100644
--- a/usr.sbin/smtpd/compress_gzip.c
+++ b/usr.sbin/smtpd/compress_gzip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: compress_gzip.c,v 1.8 2015/01/20 17:37:54 deraadt Exp $	*/
+/*	$OpenBSD: compress_gzip.c,v 1.9 2015/12/14 10:22:11 jung Exp $	*/
 
 /*
  * Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
@@ -65,7 +65,7 @@ compress_gzip_chunk(void *ib, size_t ibsz, void *ob, size_t obsz)
 
 	if ((strm = calloc(1, sizeof *strm)) == NULL)
 		return 0;
-	
+
 	strm->zalloc = Z_NULL;
 	strm->zfree = Z_NULL;
 	strm->opaque = Z_NULL;
@@ -131,23 +131,23 @@ compress_gzip_file(FILE *in, FILE *out)
 	char  ibuf[GZIP_BUFFER_SIZE];
 	int  r, w;
 	int  ret = 0;
-	
+
 	if (in == NULL || out == NULL)
 		return (0);
-	
+
 	gzf = gzdopen(fileno(out), "wb");
 	if (gzf == NULL)
 		return (0);
-	
+
 	while ((r = fread(ibuf, 1, GZIP_BUFFER_SIZE, in)) != 0) {
 		if ((w = gzwrite(gzf, ibuf, r)) != r)
 			goto end;
 	}
 	if (! feof(in))
 		goto end;
-	
+
 	ret = 1;
-	
+
 end:
 	gzclose(gzf);
 	return (ret);
diff --git a/usr.sbin/smtpd/delivery_lmtp.c b/usr.sbin/smtpd/delivery_lmtp.c
index 05f86b0a6f8..9459b72163f 100644
--- a/usr.sbin/smtpd/delivery_lmtp.c
+++ b/usr.sbin/smtpd/delivery_lmtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delivery_lmtp.c,v 1.14 2015/10/27 21:20:11 jung Exp $ */
+/* $OpenBSD: delivery_lmtp.c,v 1.15 2015/12/14 10:22:11 jung Exp $ */
 
 /*
  * Copyright (c) 2013 Ashish SHUKLA <ashish.is@lostca.se>
@@ -125,7 +125,7 @@ lmtp_open(struct deliver *deliver)
 	ssize_t		 len;
 	int		 s;
 
-	strsep(&rcpt, " "); 
+	strsep(&rcpt, " ");
 	s = (to[0] == '/') ? unix_socket(to) : inet_socket(to);
 	if ((fp = fdopen(s, "r+")) == NULL)
 		err(1, "fdopen");
diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c
index 1bc3752e338..5fe958d2436 100644
--- a/usr.sbin/smtpd/enqueue.c
+++ b/usr.sbin/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: enqueue.c,v 1.107 2015/12/07 12:29:19 sunil Exp $	*/
+/*	$OpenBSD: enqueue.c,v 1.108 2015/12/14 10:22:11 jung Exp $	*/
 
 /*
  * Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
@@ -399,7 +399,7 @@ enqueue(int argc, char *argv[], FILE *ofp)
 			if (strncasecmp("return-path: ", line, 13) == 0)
 				continue;
 		}
-		
+
 		if (msg.saw_content_transfer_encoding || msg.noheader ||
 		    inheaders || !msg.need_linesplit) {
 			send_line(fout, 0, "%.*s", (int)len, line);
@@ -870,7 +870,7 @@ savedeadletter(struct passwd *pw, FILE *in)
 
 	if (fseek(in, 0, SEEK_SET) != 0)
 		return 0;
-	
+
 	if ((fp = fopen(buffer, "w")) == NULL)
 		return 0;
 
diff --git a/usr.sbin/smtpd/iobuf.c b/usr.sbin/smtpd/iobuf.c
index 968cca945b0..e8180cd136d 100644
--- a/usr.sbin/smtpd/iobuf.c
+++ b/usr.sbin/smtpd/iobuf.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: iobuf.c,v 1.8 2015/12/05 21:27:42 mmcc Exp $	*/
-/*      
+/*	$OpenBSD: iobuf.c,v 1.9 2015/12/14 10:22:12 jung Exp $	*/
+/*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index 7247a4042d3..7c30c48f3a0 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lka.c,v 1.188 2015/12/12 20:02:31 gilles Exp $	*/
+/*	$OpenBSD: lka.c,v 1.189 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -525,7 +525,7 @@ lka_credentials(const char *tablename, const char *label, char *dst, size_t sz)
 
 		r = base64_encode((unsigned char *)buf, buflen, dst, sz);
 		free(buf);
-		
+
 		if (r == -1) {
 			log_warnx("warn: credentials parse error for %s:%s",
 			    tablename, label);
@@ -666,7 +666,7 @@ lka_X509_verify(struct ca_vrfy_req_msg *vrfy,
 	else
 		ret = 1;
 
-end:	
+end:
 	if (x509)
 		X509_free(x509);
 	if (x509_tmp)
diff --git a/usr.sbin/smtpd/lka_session.c b/usr.sbin/smtpd/lka_session.c
index f7ccb9bdeb6..316a35620c3 100644
--- a/usr.sbin/smtpd/lka_session.c
+++ b/usr.sbin/smtpd/lka_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lka_session.c,v 1.77 2015/11/30 12:57:05 gilles Exp $	*/
+/*	$OpenBSD: lka_session.c,v 1.78 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
@@ -709,7 +709,7 @@ lka_expand_token(char *dest, size_t len, const char *token,
 				return 0; /* modifier not found */
 		} while ((mods = sep) != NULL);
 	}
-	
+
 	if (! raw && replace)
 		for (i = 0; (size_t)i < strlen(tmp); ++i)
 			if (strchr(MAILADDR_ESCAPE, tmp[i]))
@@ -843,7 +843,7 @@ lka_expand_format(char *buf, size_t len, const struct envelope *ep,
 	return ret;
 }
 
-static int 
+static int
 mod_lowercase(char *buf, size_t len)
 {
 	char tmp[EXPAND_BUFFER];
@@ -855,7 +855,7 @@ mod_lowercase(char *buf, size_t len)
 	return 1;
 }
 
-static int 
+static int
 mod_uppercase(char *buf, size_t len)
 {
 	char tmp[EXPAND_BUFFER];
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 276a4ccf271..67322ec109a 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mta.c,v 1.197 2015/12/12 20:02:31 gilles Exp $	*/
+/*	$OpenBSD: mta.c,v 1.198 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -1042,7 +1042,7 @@ mta_on_source(struct mta_relay *relay, struct mta_source *source)
 		else if (errmask & CONNECTOR_ERROR_BLOCKED)
 			relay->failstr = "All routes to destination blocked";
 		else
-			relay->failstr = "No valid route to destination";	
+			relay->failstr = "No valid route to destination";
 	}
 
 	relay->nextsource = relay->lastsource + delay;
@@ -1906,7 +1906,7 @@ mta_relay_show(struct mta_relay *r, struct mproc *p, uint32_t id, time_t t)
 		    flags);
 		m_compose(p, IMSG_CTL_MTA_SHOW_RELAYS, id, 0, -1, buf,
 		    strlen(buf) + 1);
-		
+
 
 	}
 }
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index 44a3acba7d0..66a8ab22a39 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.c,v 1.173 2015/12/10 07:49:58 sunil Exp $	*/
+/*	$OpenBSD: queue.c,v 1.174 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -794,13 +794,13 @@ static void
 queue_log(const struct envelope *e, const char *prefix, const char *status)
 {
 	char rcpt[LINE_MAX];
-	
+
 	(void)strlcpy(rcpt, "-", sizeof rcpt);
 	if (strcmp(e->rcpt.user, e->dest.user) ||
 	    strcmp(e->rcpt.domain, e->dest.domain))
 		(void)snprintf(rcpt, sizeof rcpt, "%s@%s",
 		    e->rcpt.user, e->rcpt.domain);
-	
+
 	log_info("%s: %s for %016" PRIx64 ": from=<%s@%s>, to=<%s@%s>, "
 	    "rcpt=<%s>, delay=%s, stat=%s",
 	    e->type == D_MDA ? "delivery" : "relay",
diff --git a/usr.sbin/smtpd/queue_backend.c b/usr.sbin/smtpd/queue_backend.c
index 21e704527af..8c536199ff9 100644
--- a/usr.sbin/smtpd/queue_backend.c
+++ b/usr.sbin/smtpd/queue_backend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_backend.c,v 1.59 2015/11/05 09:14:31 sunil Exp $	*/
+/*	$OpenBSD: queue_backend.c,v 1.60 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
@@ -127,7 +127,7 @@ queue_init(const char *name, int server)
 	gr = getgrnam(SMTPD_QUEUE_GROUP);
 	if (gr == NULL)
 		errx(1, "unknown group %s", SMTPD_QUEUE_GROUP);
-	
+
 	tree_init(&evpcache_tree);
 	TAILQ_INIT(&evpcache_list);
 
@@ -653,7 +653,7 @@ queue_message_walk(struct envelope *ep, uint32_t msgid, int *done, void **data)
 			/*
 			 * do not cache the envelope here, while discovering
 			 * envelopes one could re-run discover on already
-			 * scheduled envelopes which leads to triggering of 
+			 * scheduled envelopes which leads to triggering of
 			 * strict checks in caching. Envelopes could anyway
 			 * be loaded from backend if it isn't cached.
 			 */
diff --git a/usr.sbin/smtpd/queue_fs.c b/usr.sbin/smtpd/queue_fs.c
index 7ebfb8be25f..cd1a3215b6b 100644
--- a/usr.sbin/smtpd/queue_fs.c
+++ b/usr.sbin/smtpd/queue_fs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_fs.c,v 1.11 2015/11/05 09:14:31 sunil Exp $	*/
+/*	$OpenBSD: queue_fs.c,v 1.12 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
@@ -294,7 +294,7 @@ queue_fs_envelope_create(uint32_t msgid, const char *buf, size_t len,
 		log_warnx("warn: queue-fs: msgid=0, evpid=%016"PRIx64, *evpid);
 		goto done;
 	}
-	
+
 	fsqueue_message_incoming_path(msgid, path, sizeof(path));
 	if (stat(path, &sb) == -1)
 		queued = 1;
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 89decd1655d..86aeffe48a5 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtp_session.c,v 1.262 2015/12/13 10:54:11 gilles Exp $	*/
+/*	$OpenBSD: smtp_session.c,v 1.263 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1953,7 +1953,7 @@ smtp_parse_rcpt_args(struct smtp_session *s, char *args)
 	while ((b = strsep(&args, " "))) {
 		if (*b == '\0')
 			continue;
-		
+
 		if (ADVERTISE_EXT_DSN(s) && strncasecmp(b, "NOTIFY=", 7) == 0) {
 			b += 7;
 			while ((p = strsep(&b, ","))) {
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 0e0e37f760b..b0b9d2be862 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.c,v 1.266 2015/12/12 20:02:31 gilles Exp $	*/
+/*	$OpenBSD: smtpd.c,v 1.267 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -496,7 +496,7 @@ main(int argc, char *argv[])
 		case 'F':
 			foreground = 1;
 			break;
-			
+
 		case 'T':
 			if (!strcmp(optarg, "imsg"))
 				verbose |= TRACE_IMSG;
diff --git a/usr.sbin/smtpd/to.c b/usr.sbin/smtpd/to.c
index 5b62dbdfcee..a83fc3d078b 100644
--- a/usr.sbin/smtpd/to.c
+++ b/usr.sbin/smtpd/to.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: to.c,v 1.22 2015/11/30 12:53:08 gilles Exp $	*/
+/*	$OpenBSD: to.c,v 1.23 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -127,7 +127,7 @@ text_to_mailaddr(struct mailaddr *maddr, const char *email)
 		if (strlcpy(maddr->domain, hostname, sizeof maddr->domain)
 		    >= sizeof maddr->domain)
 			return 0;
-	}	
+	}
 
 	return 1;
 }
diff --git a/usr.sbin/smtpd/util.c b/usr.sbin/smtpd/util.c
index 41b2af5a736..146d2176f35 100644
--- a/usr.sbin/smtpd/util.c
+++ b/usr.sbin/smtpd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.122 2015/10/17 22:24:36 gilles Exp $	*/
+/*	$OpenBSD: util.c,v 1.123 2015/12/14 10:22:12 jung Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Markus Friedl.  All rights reserved.
@@ -500,21 +500,21 @@ valid_domainpart(const char *s)
 			p = s + 6;
 		else
 			p = s + 1;
-	
+
 		if (strlcpy(domain, p, sizeof domain) >= sizeof domain)
 			return 0;
 
 		c = strchr(domain, (int)']');
 		if (!c || c[1] != '\0')
 			return 0;
-		
+
 		*c = '\0';
-		
+
 		if (inet_pton(AF_INET6, domain, &ina6) == 1)
 			return 1;
 		if (inet_pton(AF_INET, domain, &ina) == 1)
 			return 1;
-		
+
 		return 0;
 	}