summaryrefslogtreecommitdiff
path: root/mail/courier/files/patch-courier__submit.C
blob: ad3ac19f74b03b3dc56bf038c41c5698313a7ce8 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
--- courier/submit.C.orig	Fri Apr 22 21:38:00 2005
+++ courier/submit.C	Fri Apr 22 21:38:00 2005
@@ -531,6 +531,7 @@
 	(*hdrOut) += str;
 	(*hdrOut) += " (";
 	(*hdrOut) += errmsg_buf;
+/*
 	(*hdrOut) += ")\n  SPF=";
 	(*hdrOut) += checkname;
 	(*hdrOut) += ";\n";
@@ -550,6 +551,43 @@
 		(*hdrOut) += v ? v:strerror(errno);
 		(*hdrOut) += ";\n";
 	}
+*/
+	(*hdrOut) += ")\n  ";
+	(*hdrOut) += checkname;
+	{
+		char *v=strdup(values[0] ? values[0] : "");
+
+		for (q=v; q && *q; q++)
+			if (*q < ' ' || *q >= 127)
+				*q='?';
+			else if (*q == ';')
+				*q=' ';
+		(*hdrOut) += " ";
+		(*hdrOut) += v ? v:strerror(errno);
+	}
+	{
+		char *v=strdup(values[2] ? values[2] : "");
+
+		for (q=v; q && *q; q++)
+			if (*q < ' ' || *q >= 127)
+				*q='?';
+			else if (*q == ';')
+				*q=' ';
+		(*hdrOut) += " (";
+		(*hdrOut) += v ? v:strerror(errno);
+	}
+	{
+		char *v=strdup(values[1] ? values[1] : "");
+
+		for (q=v; q && *q; q++)
+			if (*q < ' ' || *q >= 127)
+				*q='?';
+			else if (*q == ';')
+				*q=' ';
+		(*hdrOut) += " [";
+		(*hdrOut) += v ? v:strerror(errno);
+	}
+	(*hdrOut) += "]);\n";
 	return str;
 }