Skip to content

Clean up unused FFR, _FFR_LUA_ONLY_SIGNING (fixes issue #420) #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
futatuki wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Clean up unused FFR, _FFR_LUA_ONLY_SIGNING (fixes issue #420) #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
3 changes: 0 additions & 3 deletions opendkim/opendkim-config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
12 changes: 0 additions & 12 deletions opendkim/opendkim.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 0 additions & 4 deletions opendkim/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
Loading