diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-07 18:12:20 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-03-07 18:21:22 +0000 |
| commit | ca55328260261e1805da7e4f3838644bb12bb475 (patch) | |
| tree | 062d6093448c44a6d7b7c6d9bc5d17ccaaf8902b | |
| parent | Merging upstream version 4.2+20230302. (diff) | |
| download | mdadm-ca55328260261e1805da7e4f3838644bb12bb475.tar.xz mdadm-ca55328260261e1805da7e4f3838644bb12bb475.zip | |
Updating host-name-in-default-mailfrom.patch for new upstream.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/patches/debian/0003-host-name-in-default-mailfrom.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debian/patches/debian/0003-host-name-in-default-mailfrom.patch b/debian/patches/debian/0003-host-name-in-default-mailfrom.patch index 7594d7a..870e9d4 100644 --- a/debian/patches/debian/0003-host-name-in-default-mailfrom.patch +++ b/debian/patches/debian/0003-host-name-in-default-mailfrom.patch @@ -6,12 +6,12 @@ Description: Add host name to default MAILFROM (Closes: #1006464). diff -Naurp mdadm.orig/Monitor.c mdadm/Monitor.c --- mdadm.orig/Monitor.c +++ mdadm/Monitor.c -@@ -447,7 +447,7 @@ static void send_event_email(const char - if (info->mailfrom) - fprintf(mp, "From: %s\n", info->mailfrom); +@@ -627,7 +627,7 @@ static void send_event_email(const struc + if (info.mailfrom) + fprintf(mp, "From: %s\n", info.mailfrom); else - fprintf(mp, "From: %s monitoring <root>\n", Name); -+ fprintf(mp, "From: %s monitoring <root@%s>\n", Name, hname); - fprintf(mp, "To: %s\n", info->mailaddr); - fprintf(mp, "Subject: %s event on %s:%s\n\n", event, dev, hname); - fprintf(mp, "This is an automatically generated mail message. \n"); +++ fprintf(mp, "From: %s monitoring <root@%s>\n", Name, info.hostname); + fprintf(mp, "To: %s\n", info.mailaddr); + fprintf(mp, "Subject: %s event on %s:%s\n\n", data->event_name, data->dev, info.hostname); + fprintf(mp, "This is an automatically generated mail message.\n"); |