Attachment 920490 Details for Bug 1113617 – patch for empty from

[patch] patch for empty from

mailx-12.5-smpt-empty-from.patch (text/plain), 1.14 KB, created by Jan Chaloupka on 2014-07-24 10:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Chaloupka

Created: 2014-07-24 10:00:26 UTC

Size: 1.14 KB

patch

obsolete

>From 2ec9c624ac4d857cf3fbd469a574fdbfd335c746 Mon Sep 17 00:00:00 2001
>From: Jan Chaloupka <jchaloup@redhat.com>
>Date: Thu, 24 Jul 2014 11:00:32 +0200
>Subject: [PATCH] smtp empty from
>
>---
> smtp.c | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
>diff --git a/smtp.c b/smtp.c
>index b4561e3..b383732 100644
>--- a/smtp.c
>+++ b/smtp.c
>@@ -127,6 +127,7 @@ myaddrs(struct header *hp)
> {
> 	char *cp, *hn;
> 	static char *addr;
>+	static from_error = 0;
> 	size_t sz;
> 
> 	if (hp != NULL && hp->h_from != NULL) {
>@@ -135,8 +136,20 @@ myaddrs(struct header *hp)
> 		if (hp->h_from->n_name)
> 			return savestr(hp->h_from->n_name);
> 	}
>-	if ((cp = value("from")) != NULL)
>-		return cp;
>+	if ((cp = value("from")) != NULL) {
>+		if (strlen(cp) == 0) {
>+			if (!from_error) {
>+				fprintf(stderr, "From address is empty. ");
>+				fprintf(stderr, "Check your mail config ");
>+				fprintf(stderr, " file for typos. E.g. no ");
>+				fprintf(stderr, "whitespace after set from=");
>+				fprintf(stderr, "\n");
>+				from_error = 1;
>+			}
>+		}
>+		else
>+			return cp;
>+	}
> 	/*
> 	 * When invoking sendmail directly, it's its task
> 	 * to generate a From: address.
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1113617: 920490