Mercurial > dnsbl
comparison src/spamass.cpp.in @ 170:bd33eaccfed8
fix pre/post scripts in rpm spec file
author | carl |
---|---|
date | Thu, 30 Aug 2007 14:07:09 -0700 |
parents | 6bac960af6b4 |
children | a4d313c2460b |
comparison
equal
deleted
inserted
replaced
169:44021d570958 | 170:bd33eaccfed8 |
---|---|
97 macro_i = queueid; | 97 macro_i = queueid; |
98 | 98 |
99 // FQDN of this site | 99 // FQDN of this site |
100 macro_j = getorwarnmacro(ctx, "j", "localhost", "ENVRCPT"); | 100 macro_j = getorwarnmacro(ctx, "j", "localhost", "ENVRCPT"); |
101 | 101 |
102 // Protocol used to receive the message */ | 102 // Protocol used to receive the message, not really needed by spam assassin |
103 macro_r = getorwarnmacro(ctx, "r", "SMTP", "ENVRCPT"); | 103 macro_r = "SMTP"; |
104 | 104 |
105 // helo value we already have | |
105 macro_s = helo; | 106 macro_s = helo; |
106 | 107 |
107 // Sendmail binary version | 108 // Sendmail binary version, not really needed by spam assassin |
108 macro_v = getorwarnmacro(ctx, "v", "8.13.0", "ENVRCPT"); | 109 macro_v = "8.13.0"; |
109 | 110 |
110 // Sendmail .cf version | 111 // Sendmail .cf version, not really needed by spam assassin |
111 macro_Z = getorwarnmacro(ctx, "Z", "8.13.0", "ENVRCPT"); | 112 macro_Z = "8.13.0"; |
112 | 113 |
113 // Validated sending site's address | 114 // Validated sending site's address |
114 macro__ = getorwarnmacro(ctx, "_", "unknown", "ENVRCPT"); | 115 macro__ = getorwarnmacro(ctx, "_", "unknown", "ENVRCPT"); |
115 | 116 |
116 output(string("Received: from ") + macro_s + " (" + macro__+ ")\r\n\t" + | 117 output(string("Received: from ") + macro_s + " (" + macro__+ ")\r\n\t" + |
117 "by " + macro_j + " (" + macro_v + "/" + macro_Z + ") with " + macro_r + " id " + macro_i + "\r\n\t" + | 118 "by " + macro_j + " (" + macro_v + "/" + macro_Z + ") with " + macro_r + " id " + macro_i + "\r\n\t" + |
118 "for " + envfrom + ";\r\n\t" + | 119 "for " + envfrom + ";\r\n\t" + |
119 macro_b + "\r\n"); | 120 macro_b + "\r\n"); |