Mercurial > dnsbl
diff src/context.h @ 464:428de28b34b7
cleanup code for adding extra spf data in dkim_from
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Sun, 10 Mar 2019 08:49:27 -0700 |
| parents | f3f1ece619ba |
| children | 5209e92b4885 |
line wrap: on
line diff
--- a/src/context.h Sat Mar 09 18:53:12 2019 -0800 +++ b/src/context.h Sun Mar 10 08:49:27 2019 -0700 @@ -142,8 +142,9 @@ struct DKIM { const char *action; const char *signer; + const char *extraspf; public: - DKIM(const char *action_, const char *signer_); + DKIM(const char *action_, const char *signer_, const char*extraspf_); }; struct DNSBL { @@ -278,8 +279,8 @@ void add_dkim_signer(const char *signer, const char *action) {dkim_signer_names[signer] = action;}; DKIMP find_dkim_from(const char *name); - void add_dkim_from(const char *from, const char *action, const char *signer) - {dkim_from_names[from] = new DKIM(action,signer);}; + void add_dkim_from(const char *from, const char *action, const char *signer, const char *extraspf) + {dkim_from_names[from] = new DKIM(action,signer,extraspf);}; void add_dnsbl(const char *name, DNSBLP dns) {dnsbl_names[name] = dns; }; void add_dnsbl(DNSBLP dns) {dnsbl_list.push_back(dns);}; @@ -325,7 +326,7 @@ void log(const char *queueid, const char *msg, const char *v); const char *extra_spf_data(const char *signers); bool in_signing_set(const char *s, const char *signers); - void replace(char *buf, char *p, const char *what); + void replace(char *buf, char *p, int nn, const char *what); bool resolve_spf(const char *from, uint32_t ip, mlfiPriv *priv, const char *extraspf); bool resolve_one_spf(const char *from, uint32_t ip, mlfiPriv *priv, const char *extraspf, int level = 0); const char *acceptable_content(bool local_source, recorder &memory, int score, int bulk, const char *queueid, string_set &signers, const char *from, mlfiPriv *priv, string& msg);