From ff27cc3df60dd1ea7162b463c148f49c73ab68c2 Mon Sep 17 00:00:00 2001
From: FUTATSUKI Yasuhito <futatuki@yf.bsdclub.org>
Date: Thu, 18 Jun 2026 00:00:48 +0900
Subject: [PATCH] Clean up unused FFR, FFR_LUA_ONLY_SIGNING

Fix issue #420.

That feature was added on 568adc1 in 2013-12-28 by feature request 177
in SourceForge (https://sourceforge.net/p/opendkim/feature-requests/177/).

However it was incompletely removed from configure.ac on 9628f53
in 2014-03-17 as "unknown feature", without removing other source
code changes for the feature.

With this commit, clean up rest of the code fragments for the feature.
---
 configure.ac               |  2 --
 opendkim/opendkim-config.h |  3 ---
 opendkim/opendkim.c        | 12 ------------
 opendkim/util.c            |  4 ----
 4 files changed, 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 46b7d8a0..11e36f7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1699,8 +1699,6 @@ main(int argc, char** argv)
 ])
 
 AS_IF([test x"$lua_found" != x"yes"], [
-  AS_IF([test x"$enable_lua_only_signing" = x"yes"],
-    [AC_MSG_ERROR([--enable-lua_only_signing requires Lua support])])
   AS_IF([test x"$enable_statsext" = x"yes"],
     [AC_MSG_ERROR([--enable-statsext requires Lua support])])
   AS_IF([test x"$enable_rbl" = x"yes"],
diff --git a/opendkim/opendkim-config.h b/opendkim/opendkim-config.h
index 79ca264d..7070538d 100644
--- a/opendkim/opendkim-config.h
+++ b/opendkim/opendkim-config.h
@@ -101,9 +101,6 @@ struct configdef dkimf_config[] =
 #endif /* USE_LDAP */
 	{ "LogResults",			CONFIG_TYPE_BOOLEAN,	FALSE },
 	{ "LogWhy",			CONFIG_TYPE_BOOLEAN,	FALSE },
-#ifdef _FFR_LUA_ONLY_SIGNING
-	{ "LuaOnlySigning",		CONFIG_TYPE_BOOLEAN,	FALSE },
-#endif /* _FFR_LUA_ONLY_SIGNING */
 	{ "MaximumHeaders",		CONFIG_TYPE_INTEGER,	FALSE },
 	{ "MaximumSignedBytes",		CONFIG_TYPE_INTEGER,	FALSE },
 	{ "MaximumSignaturesToVerify",	CONFIG_TYPE_INTEGER,	FALSE },
diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c
index 2b59d3ac..3b63d956 100644
--- a/opendkim/opendkim.c
+++ b/opendkim/opendkim.c
@@ -220,9 +220,6 @@ struct dkimf_config
 #if defined(USE_LDAP) || defined(USE_ODBX)
 	_Bool		conf_softstart;		/* do LDAP/SQL soft starts */
 #endif /* defined(USE_LDAP) || defined(USE_ODBX) */
-#ifdef _FFR_LUA_ONLY_SIGNING
-	_Bool		conf_luasigning;	/* signing via Lua only */
-#endif /* _FFR_LUA_ONLY_SIGNING */
 	_Bool		conf_weaksyntax;	/* do weaker syntax checking */
 	_Bool		conf_passmalformed;	/* pass malformed messages */
 	_Bool		conf_logresults;	/* log all results */
@@ -6603,12 +6600,6 @@ dkimf_config_load(struct config *data, struct dkimf_config *conf,
 		                  &conf->conf_weaksyntax,
 		                  sizeof conf->conf_weaksyntax);
 
-#ifdef _FFR_LUA_ONLY_SIGNING
-		(void) config_get(data, "LuaOnlySigning",
-		                  &conf->conf_luasigning,
-		                  sizeof conf->conf_luasigning);
-#endif /* _FFR_LUA_ONLY_SIGNING */
-
 		(void) config_get(data, "IgnoreMalformedMail",
 		                  &conf->conf_passmalformed,
 		                  sizeof conf->conf_passmalformed);
@@ -12680,9 +12671,6 @@ mlfi_eoh(SMFICTX *ctx)
 	/* still no key selected; check the signing table (if any) */
 	if (originok && dfc->mctx_srhead == NULL &&
 	    (user != NULL && dfc->mctx_domain[0] != '\0') && 
-#ifdef _FFR_LUA_ONLY_SIGNING
-	    !conf->conf_luasigning &&
-#endif /* _FFR_LUA_ONLY_SIGNING */
 	    conf->conf_keytabledb != NULL && conf->conf_signtabledb != NULL)
 	{
 		int found;
diff --git a/opendkim/util.c b/opendkim/util.c
index 9d81ab6b..aec6497b 100644
--- a/opendkim/util.c
+++ b/opendkim/util.c
@@ -148,10 +148,6 @@ static char *optlist[] =
 	"_FFR_LDAP_CACHING",
 #endif /* _FFR_LDAP_CACHING */
 
-#if _FFR_LUA_ONLY_SIGNING
-	"_FFR_LUA_ONLY_SIGNING",
-#endif /* _FFR_LUA_ONLY_SIGNING */
-
 #if _FFR_POSTGRESQL_RECONNECT_HACK
 	"_FFR_POSTGRESQL_RECONNECT_HACK",
 #endif /* _FFR_POSTGRESQL_RECONNECT_HACK */