← Back to branch summary

~ubuntu-branches/ubuntu/quantal/opendmarc/quantal-backports

« back to all changes in this revision

Viewing changes to opendmarc/opendmarc.c

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2013-04-01 23:20:45 UTC
  • mfrom: (4.1.3 sid)
  • Revision ID: package-import@ubuntu.com-20130401232045-r994v0oz6b2ha6ef
Tags: 1.1.2-1~ubuntu12.10.1
No-change backport to quantal

Show diffs side-by-side

added added

removed removed

Lines of Context:
opendmarc/opendmarc.c
525
525
                        }
526
526
                        else if (!isspace(*p))
527
527
                        {
528
 
                                if (key != NULL)
 
528
                                if (key == NULL)
529
529
                                        key = p;
530
530
                                else if (gapfound && value == NULL)
531
531
                                        value = p;
2103
2103
                                if (ar.ares_result[c].result_result != ARES_RESULT_PASS)
2104
2104
                                        continue;
2105
2105
 
 
2106
                                spfaddr = NULL;
2106
2107
                                spfmode = DMARC_POLICY_SPF_ORIGIN_HELO;
2107
2108
 
2108
2109
                                memset(addrbuf, '\0', sizeof addrbuf);
2135
2136
                                        }
2136
2137
                                }
2137
2138
 
 
2139
                                if (spfaddr == NULL)
 
2140
                                {
 
2141
                                        if (conf->conf_dolog)
 
2142
                                        {
 
2143
                                                syslog(LOG_ERR,
 
2144
                                                       "%s: can't extract SPF address from Authentication-Results",
 
2145
                                                       dfc->mctx_jobid);
 
2146
                                        }
 
2147
 
 
2148
                                        continue;
 
2149
                                }
 
2150
 
2138
2151
                                status = dmarcf_mail_parse(addrbuf, &user,
2139
2152
                                                           &domain);
2140
2153
                                if (status != 0 || domain == NULL ||