Restore X-Header for now

trusteddomainproject · May 4, 2015 · 9480591 · 9480591
1 parent 6c5b2e6
commit 9480591
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c
@@ -6490,9 +6490,24 @@ dkimf_config_load(struct config *data, struct dkimf_config *conf,
 
 		if (!conf->conf_addswhdr)
 		{
-			(void) config_get(data, "SoftwareHeader",
+			(void) config_get(data, "X-Header",
 			                  &conf->conf_addswhdr,
 			                  sizeof conf->conf_addswhdr);
+
+			if (conf->conf_addswhdr)
+			{
+				if (conf->conf_dolog)
+				{
+					syslog(LOG_WARNING,
+					       "\"X-Header\" deprecated; use \"SoftwareHeader\" instead");
+				}
+			}
+			else
+			{
+				(void) config_get(data, "SoftwareHeader",
+				                  &conf->conf_addswhdr,
+				                  sizeof conf->conf_addswhdr);
+			}
 		}
 
 		(void) config_get(data, "DomainKeysCompat",