Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 335980 Details for
Bug 452470
mail-filter/opendkim needs optimization
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git commit 23548465adccd682ba9ecba58025f852d2353bad
opendkim-2.7.4-disablecryptoinit.patch (text/plain), 3.39 KB, created by
Christian Roessner
on 2013-01-18 00:10:43 UTC
(
hide
)
Description:
git commit 23548465adccd682ba9ecba58025f852d2353bad
Filename:
MIME Type:
Creator:
Christian Roessner
Created:
2013-01-18 00:10:43 UTC
Size:
3.39 KB
patch
obsolete
>commit 23548465adccd682ba9ecba58025f852d2353bad >Author: Murray S. Kucherawy <msk@trusteddomain.org> >Date: Thu Jan 10 00:49:11 2013 -0800 > > Fix bug #SF3531477: Add (hopefully temporary) configuration option > "DisableCryptoInit" so that opendkim's initialization of the crypto library > doesn't conflict with the same work done by other libraries. Reported by > Quanah Gibson-Mount. > >diff --git a/opendkim/opendkim-config.h b/opendkim/opendkim-config.h >index dfc3606..0d40bb9 100644 >--- a/opendkim/opendkim-config.h >+++ b/opendkim/opendkim-config.h >@@ -56,6 +56,7 @@ struct configdef dkimf_config[] = > { "Diagnostics", CONFIG_TYPE_BOOLEAN, FALSE }, > { "DiagnosticDirectory", CONFIG_TYPE_STRING, FALSE }, > { "DisableADSP", CONFIG_TYPE_BOOLEAN, FALSE }, >+ { "DisableCryptoInit", CONFIG_TYPE_BOOLEAN, FALSE }, > #ifdef _FFR_DKIM_REPUTATION > { "DKIMReputationFail", CONFIG_TYPE_INTEGER, FALSE }, > { "DKIMReputationPass", CONFIG_TYPE_INTEGER, FALSE }, >diff --git a/opendkim/opendkim-crypto.c b/opendkim/opendkim-crypto.c >index 2ea9b44..fb42fd0 100644 >--- a/opendkim/opendkim-crypto.c >+++ b/opendkim/opendkim-crypto.c >@@ -121,9 +121,12 @@ dkimf_crypto_init(void) > void > dkimf_crypto_free(void) > { >- (void) gnutls_global_deinit(); >+ if (crypto_init_done) >+ { >+ (void) gnutls_global_deinit(); > >- (void) pthread_key_delete(logkey); >+ (void) pthread_key_delete(logkey); >+ } > > return; > } >diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c >index 9863d30..3fa0a60 100644 >--- a/opendkim/opendkim.c >+++ b/opendkim/opendkim.c >@@ -209,6 +209,7 @@ struct lua_global > > struct dkimf_config > { >+ _Bool conf_disablecryptoinit; /* initialize SSL libs? */ > #ifdef USE_LDAP > _Bool conf_softstart; /* do LDAP soft starts */ > #endif /* USE_LDAP */ >@@ -6414,6 +6415,10 @@ dkimf_config_load(struct config *data, struct dkimf_config *conf, > &conf->conf_noadsp, > sizeof conf->conf_noadsp); > >+ (void) config_get(data, "DisableCryptoInit", >+ &conf->conf_disablecryptoinit, >+ sizeof conf->conf_disablecryptoinit); >+ > str = NULL; > (void) config_get(data, "ADSPAction", &str, sizeof str); > if (str != NULL) >@@ -17503,11 +17508,15 @@ main(int argc, char **argv) > } > > /* initialize libcrypto mutexes */ >- status = dkimf_crypto_init(); >- if (status != 0) >+ if (!curconf->conf_disablecryptoinit) > { >- fprintf(stderr, "%s: error initializing crypto library: %s\n", >- progname, strerror(status)); >+ status = dkimf_crypto_init(); >+ if (status != 0) >+ { >+ fprintf(stderr, >+ "%s: error initializing crypto library: %s\n", >+ progname, strerror(status)); >+ } > } > > if ((curconf->conf_mode & DKIMF_MODE_VERIFIER) != 0 && >diff --git a/opendkim/opendkim.conf.5.in b/opendkim/opendkim.conf.5.in >index a963e73..2c20549 100644 >--- a/opendkim/opendkim.conf.5.in >+++ b/opendkim/opendkim.conf.5.in >@@ -236,6 +236,12 @@ If set, suppresses Author Domain Signing Practices (ADSP) checks, which > require multiple additional DNS queries. > > .TP >+.I DisableCryptoInit (Boolean) >+If set, skips initialization of the SSL library initialization steps, which >+are normaly required in multi-threaded environments. This assumes some other >+library opendkim is using will do the required initialization and shutdown. >+ >+.TP > .I DKIMReputationFail (integer) > If the reputation returned by the DNS reputation service exceeds this > value then the result "x-dkim-rep" is set to "fail".
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 452470
:
335976
|
335978
| 335980