issue trusteddomainproject#222: Don't treat empty body as partial if "Minimum" option is set.

* opendkim/opendkim.c (mlfi_eom)

Author: futatuki

opendkim/opendkim.c

@@ -14026,29 +14026,33 @@ mlfi_eom(SMFICTX *ctx)
 				                            sig, &bodylen,
 				                            &canonlen, NULL);
 
-				if (conf->conf_sigmintype == SIGMIN_PERCENT)
+				/* In the case body is empty, we don't treat it as partial */
+				if (bodylen)
 				{
-					size_t signpct;
+					if (conf->conf_sigmintype == SIGMIN_PERCENT)
+					{
+						size_t signpct;
 
-					signpct = (100 * canonlen) / bodylen;
+						signpct = (100 * canonlen) / bodylen;
 
-					if (signpct < conf->conf_sigmin)
-						dfc->mctx_status = DKIMF_STATUS_PARTIAL;
-				}
-				else if (conf->conf_sigmintype == SIGMIN_MAXADD)
-				{
-					if (canonlen + conf->conf_sigmin < bodylen)
-						dfc->mctx_status = DKIMF_STATUS_PARTIAL;
-				}
-				else
-				{
-					size_t required;
+						if (signpct < conf->conf_sigmin)
+							dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+					}
+					else if (conf->conf_sigmintype == SIGMIN_MAXADD)
+					{
+						if (canonlen + conf->conf_sigmin < bodylen)
+							dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+					}
+					else
+					{
+						size_t required;
 
-					required = MIN(conf->conf_sigmin,
-					               bodylen);
+						required = MIN(conf->conf_sigmin,
+						               bodylen);
 
-					if (canonlen < required)
-						dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+						if (canonlen < required)
+							dfc->mctx_status = DKIMF_STATUS_PARTIAL;
+					}
 				}
 			}
 		}