git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPF: enhance A-R result
[users/jgh/exim.git]
/
src
/
src
/
spf.c
diff --git
a/src/src/spf.c
b/src/src/spf.c
index 48f26f31593f1b627ce047a8762d33d075aaf3ac..3a1912a918573522b9608251056a107205467e87 100644
(file)
--- a/
src/src/spf.c
+++ b/
src/src/spf.c
@@
-402,8
+402,12
@@
if (spf_result_guessed)
g = string_cat(g, US" (best guess record for domain)");
s = expand_string(US"$sender_address_domain");
g = string_cat(g, US" (best guess record for domain)");
s = expand_string(US"$sender_address_domain");
+if (s && *s)
+ return string_append(g, 2, US" smtp.mailfrom=", s);
+
+s = sender_helo_name;
return s && *s
return s && *s
- ? string_append(g, 2, US" smtp.
mailfrom
=", s)
+ ? string_append(g, 2, US" smtp.
helo
=", s)
: string_cat(g, US" smtp.mailfrom=<>");
}
: string_cat(g, US" smtp.mailfrom=<>");
}