bug 4661: SPF checks should be done against trusted, but external relays -- get correct EnvFrom & optimize
bug 4661: SPF checks should be done against trusted, but external relays -- get correct EnvFrom & optimize

git-svn-id: e9fe9b84e32fc5e57b7d09c40cd78b14ea28ed71@331932 13f79535-47bb-0310-9956-ffa450edef68

apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin,apache/spamassassin