37 lines
894 B
Diff
37 lines
894 B
Diff
diff --git a/opendmarc/opendmarc.c b/opendmarc/opendmarc.c
|
|
index 65f6b49..ffcbc3f 100644
|
|
--- a/opendmarc/opendmarc.c
|
|
+++ b/opendmarc/opendmarc.c
|
|
@@ -2474,17 +2474,22 @@ mlfi_eom(SMFICTX *ctx)
|
|
|
|
for (c = 1; users[c] != NULL; c++)
|
|
{
|
|
- if (strcasecmp(domains[0], domains[c]) != 0)
|
|
+ if (domains[0] != NULL
|
|
+ && domains[c] != NULL
|
|
+ && strcasecmp(domains[0], domains[c]) != 0)
|
|
{
|
|
- syslog(LOG_ERR,
|
|
- "%s: multi-valued From field detected",
|
|
- dfc->mctx_jobid);
|
|
- }
|
|
+ if (conf->conf_dolog)
|
|
+ {
|
|
+ syslog(LOG_ERR,
|
|
+ "%s: multi-valued From field detected",
|
|
+ dfc->mctx_jobid);
|
|
+ }
|
|
|
|
- if (conf->conf_reject_multi_from)
|
|
- return SMFIS_REJECT;
|
|
- else
|
|
- return SMFIS_ACCEPT;
|
|
+ if (conf->conf_reject_multi_from)
|
|
+ return SMFIS_REJECT;
|
|
+ else
|
|
+ return SMFIS_ACCEPT;
|
|
+ }
|
|
}
|
|
|
|
user = users[0];
|