diff options
| author | Micah <micah@leap.se> | 2016-02-02 15:50:13 -0500 |
|---|---|---|
| committer | Micah <micah@leap.se> | 2016-02-04 10:28:29 -0500 |
| commit | 461c682cccef760248d6c24d93c6ae47dd14fd22 (patch) | |
| tree | 943714856c752889bc535fa9fe669db159c30e33 /puppet/modules/site_postfix | |
| parent | 67590f45a88eb1747bba56489e0957684b54ceac (diff) | |
fix postfix Received anonymizing header regexp to properly match Client
CN entries (#7867)
Change-Id: Ie33277a62e90f9dc0602bb963dbb96a61cebed1d
Diffstat (limited to 'puppet/modules/site_postfix')
| -rw-r--r-- | puppet/modules/site_postfix/files/checks/received_anon | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_postfix/files/checks/received_anon b/puppet/modules/site_postfix/files/checks/received_anon index 2822973e..9de25e63 100644 --- a/puppet/modules/site_postfix/files/checks/received_anon +++ b/puppet/modules/site_postfix/files/checks/received_anon @@ -1,2 +1,2 @@ -/^Received: from (.* \([-._[:alnum:]]+ \[[.[:digit:]]{7,15}\]\))([[:space:]]+).*(\(using [.[:alnum:]]+ with cipher [-A-Z0-9]+ \([0-9]+\/[0-9]+ bits\)\))[[:space:]]+\(Client CN "([[:alnum:]]+)", Issuer "[[:print:]]+" \(verified OK\)\)[[:space:]]+by ([.[:alnum:]]+) \(([^)]+)\) with (E?SMTPS?A?) id ([A-F[:digit:]]+).*/ +/^Received: from (.* \([-._[:alnum:]]+ \[[.[:digit:]]{7,15}\]\))([[:space:]]+).*(\(using [.[:alnum:]]+ with cipher [-A-Z0-9]+ \([0-9]+\/[0-9]+ bits\)\))[[:space:]]+\(Client CN "([-._@[:alnum:]]+)", Issuer "[[:print:]]+" \(verified OK\)\)[[:space:]]+by ([.[:alnum:]]+) \(([^)]+)\) with (E?SMTPS?A?) id ([A-F[:digit:]]+).*/ REPLACE Received: from [127.0.0.1] (localhost [127.0.0.1])${2}${3}${2}(Authenticated sender: $4)${2}with $7 id $8 |