From fe57dc31869ee8017262be0971109ac0197ab382 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Mon, 22 Sep 2014 20:40:18 +0200 Subject: [PATCH] FIX: minor errors in email --- src/org/cacert/gigi/email/EmailProvider.java | 6 ++++++ src/org/cacert/gigi/email/Sendmail.java | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java index 3e6d3493..64902429 100644 --- a/src/org/cacert/gigi/email/EmailProvider.java +++ b/src/org/cacert/gigi/email/EmailProvider.java @@ -77,6 +77,12 @@ public abstract class EmailProvider { } for (String host : mxhosts) { + host = host.split(" ", 2)[1]; + if (host.endsWith(".")) { + host = host.substring(0, host.length() - 1); + } else { + return "Strange MX records."; + } try (Socket s = new Socket(host, 25); BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream())); PrintWriter pw = new PrintWriter(s.getOutputStream())) { String line; while ((line = br.readLine()) != null && line.startsWith("220-")) { diff --git a/src/org/cacert/gigi/email/Sendmail.java b/src/org/cacert/gigi/email/Sendmail.java index 60113050..1eb1d914 100644 --- a/src/org/cacert/gigi/email/Sendmail.java +++ b/src/org/cacert/gigi/email/Sendmail.java @@ -52,8 +52,10 @@ public class Sendmail extends EmailProvider { // TODO SimpleDateFormat emailDate = new SimpleDateFormat("E, d MMM yyyy HH:mm:ss ZZZZ (z)", Locale.ENGLISH); out.print("Date: " + emailDate.format(new Date(System.currentTimeMillis())) + "\r\n"); - out.print("Sender: " + errorsto + "\r\n"); - out.print("Errors-To: " + errorsto + "\r\n"); + if (errorsto != null) { + out.print("Sender: " + errorsto + "\r\n"); + out.print("Errors-To: " + errorsto + "\r\n"); + } if (replyto != null) { out.print("Reply-To: " + replyto + "\r\n"); } else { -- 2.39.2