Attachment #335980 for bug #452470

Lines 56-61 struct configdef dkimf_config[] = Link Here

(-)a/opendkim/opendkim-config.h (+1 lines)
56	{ "Diagnostics", CONFIG_TYPE_BOOLEAN, FALSE },	56	{ "Diagnostics", CONFIG_TYPE_BOOLEAN, FALSE },
57	{ "DiagnosticDirectory", CONFIG_TYPE_STRING, FALSE },	57	{ "DiagnosticDirectory", CONFIG_TYPE_STRING, FALSE },
58	{ "DisableADSP", CONFIG_TYPE_BOOLEAN, FALSE },	58	{ "DisableADSP", CONFIG_TYPE_BOOLEAN, FALSE },
		59	{ "DisableCryptoInit", CONFIG_TYPE_BOOLEAN, FALSE },
59	#ifdef _FFR_DKIM_REPUTATION	60	#ifdef _FFR_DKIM_REPUTATION
60	{ "DKIMReputationFail", CONFIG_TYPE_INTEGER, FALSE },	61	{ "DKIMReputationFail", CONFIG_TYPE_INTEGER, FALSE },
61	{ "DKIMReputationPass", CONFIG_TYPE_INTEGER, FALSE },	62	{ "DKIMReputationPass", CONFIG_TYPE_INTEGER, FALSE },

Lines 121-129 dkimf_crypto_init(void) Link Here

(-)a/opendkim/opendkim-crypto.c (-2 / +5 lines)
121	void	121	void
122	dkimf_crypto_free(void)	122	dkimf_crypto_free(void)
123	{	123	{
124	(void) gnutls_global_deinit();	124	if (crypto_init_done)
		125	{
		126	(void) gnutls_global_deinit();
125		127
126	(void) pthread_key_delete(logkey);	128	(void) pthread_key_delete(logkey);
		129	}
127		130
128	return;	131	return;
129	}	132	}

Lines 209-214 struct lua_global Link Here

(-)a/opendkim/opendkim.c (-4 / +13 lines)
209		209
210	struct dkimf_config	210	struct dkimf_config
211	{	211	{
		212	_Bool conf_disablecryptoinit; /* initialize SSL libs? */
212	#ifdef USE_LDAP	213	#ifdef USE_LDAP
213	_Bool conf_softstart; /* do LDAP soft starts */	214	_Bool conf_softstart; /* do LDAP soft starts */
214	#endif /* USE_LDAP */	215	#endif /* USE_LDAP */
Lines 6414-6419 dkimf_config_load(struct config data, struct dkimf_config conf, Link Here
6414	&conf->conf_noadsp,	6415	&conf->conf_noadsp,
6415	sizeof conf->conf_noadsp);	6416	sizeof conf->conf_noadsp);
6416		6417
		6418	(void) config_get(data, "DisableCryptoInit",
		6419	&conf->conf_disablecryptoinit,
		6420	sizeof conf->conf_disablecryptoinit);
		6421
6417	str = NULL;	6422	str = NULL;
6418	(void) config_get(data, "ADSPAction", &str, sizeof str);	6423	(void) config_get(data, "ADSPAction", &str, sizeof str);
6419	if (str != NULL)	6424	if (str != NULL)
Lines 17503-17513 main(int argc, char **argv) Link Here
17503	}	17508	}
17504		17509
17505	/* initialize libcrypto mutexes */	17510	/* initialize libcrypto mutexes */
17506	status = dkimf_crypto_init();	17511	if (!curconf->conf_disablecryptoinit)
17507	if (status != 0)
17508	{	17512	{
17509	fprintf(stderr, "%s: error initializing crypto library: %s\n",	17513	status = dkimf_crypto_init();
17510	progname, strerror(status));	17514	if (status != 0)
		17515	{
		17516	fprintf(stderr,
		17517	"%s: error initializing crypto library: %s\n",
		17518	progname, strerror(status));
		17519	}
17511	}	17520	}
17512		17521
17513	if ((curconf->conf_mode & DKIMF_MODE_VERIFIER) != 0 &&	17522	if ((curconf->conf_mode & DKIMF_MODE_VERIFIER) != 0 &&

Lines 236-241 If set, suppresses Author Domain Signing Practices (ADSP) checks, which Link Here

(-)a/opendkim/opendkim.conf.5.in (+6 lines)
236	require multiple additional DNS queries.	236	require multiple additional DNS queries.
237		237
238	.TP	238	.TP
		239	.I DisableCryptoInit (Boolean)
		240	If set, skips initialization of the SSL library initialization steps, which
		241	are normaly required in multi-threaded environments. This assumes some other
		242	library opendkim is using will do the required initialization and shutdown.
		243
		244	.TP
239	.I DKIMReputationFail (integer)	245	.I DKIMReputationFail (integer)
240	If the reputation returned by the DNS reputation service exceeds this	246	If the reputation returned by the DNS reputation service exceeds this
241	value then the result "x-dkim-rep" is set to "fail".	247	value then the result "x-dkim-rep" is set to "fail".

Return to bug 452470