Merge pull request trusteddomainproject#234 from futatuki/issue233-fi…

…x-results-ignored-sigs

FIx issue trusteddomainproject#233: use "dkim=policy" for the result of DKIM signature
which is marked as "ignore" by dkim_sig_ignore(), instead of
"dikim=fail".

opendkim/opendkim.c

@@ -10682,6 +10682,7 @@ dkimf_ar_all_sigs(char *hdr, size_t hdrlen, struct dkimf_dstring *tmpstr,
 
 		for (c = 0; c < nsigs; c++)
 		{
+			unsigned int sigflag;
 			dnssec = NULL;
 
 			memset(comment, '\0', sizeof comment);
@@ -10703,7 +10704,12 @@ dkimf_ar_all_sigs(char *hdr, size_t hdrlen, struct dkimf_dstring *tmpstr,
 				                           &ssl);
 			}
 
-			if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) != 0 &&
+			sigflag = dkim_sig_getflags(sigs[c]);
+			if (sigflag & DKIM_SIGFLAG_IGNORE)
+			{
+				result = "policy";
+			}
+			else if ((sigflag & DKIM_SIGFLAG_PASSED) != 0 &&
 			    dkim_sig_getbh(sigs[c]) == DKIM_SIGBH_MATCH)
 			{
 				result = "pass";
@@ -10727,8 +10733,8 @@ dkimf_ar_all_sigs(char *hdr, size_t hdrlen, struct dkimf_dstring *tmpstr,
 					         " reason=\"%s\"", err);
 				}
 			}
-			else if ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PROCESSED) != 0 &&
-			         ((dkim_sig_getflags(sigs[c]) & DKIM_SIGFLAG_PASSED) == 0 ||
+			else if ((sigflag & DKIM_SIGFLAG_PROCESSED) != 0 &&
+			         ((sigflag & DKIM_SIGFLAG_PASSED) == 0 ||
 			          dkim_sig_getbh(sigs[c]) != DKIM_SIGBH_MATCH))
 			{
 				const char *err;