Jan Vcelak
parent
328c8e208b
commit
f47de25361
125
openldap-nss-deferred-init-copy-params.patch
Normal file
125
openldap-nss-deferred-init-copy-params.patch
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
Replication (syncrepl) with TLS causes segfault
|
||||||
|
|
||||||
|
Upstream ITS: #7136
|
||||||
|
Upstrem commit: 4e9926ca9719a0dab8c780d3d2f4cf4bfc03bfdc
|
||||||
|
Resolves: #783431
|
||||||
|
Author: Jan Vcelak <jvcelak@redhat.com>
|
||||||
|
|
||||||
|
diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
|
||||||
|
index da230c5..092b59f 100644
|
||||||
|
--- a/libraries/libldap/tls_m.c
|
||||||
|
+++ b/libraries/libldap/tls_m.c
|
||||||
|
@@ -1960,6 +1960,66 @@ tlsm_destroy( void )
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+static struct ldaptls *
|
||||||
|
+tlsm_copy_config ( const struct ldaptls *config )
|
||||||
|
+{
|
||||||
|
+ struct ldaptls *copy;
|
||||||
|
+
|
||||||
|
+ assert(config);
|
||||||
|
+
|
||||||
|
+ copy = LDAP_MALLOC(sizeof(*copy));
|
||||||
|
+ if (!copy)
|
||||||
|
+ return NULL;
|
||||||
|
+
|
||||||
|
+ memset(copy, 0, sizeof(*copy));
|
||||||
|
+
|
||||||
|
+ if (config->lt_certfile)
|
||||||
|
+ copy->lt_certfile = LDAP_STRDUP(config->lt_certfile);
|
||||||
|
+ if (config->lt_keyfile)
|
||||||
|
+ copy->lt_keyfile = LDAP_STRDUP(config->lt_keyfile);
|
||||||
|
+ if (config->lt_dhfile)
|
||||||
|
+ copy->lt_dhfile = LDAP_STRDUP(config->lt_dhfile);
|
||||||
|
+ if (config->lt_cacertfile)
|
||||||
|
+ copy->lt_cacertfile = LDAP_STRDUP(config->lt_cacertfile);
|
||||||
|
+ if (config->lt_cacertdir)
|
||||||
|
+ copy->lt_cacertdir = LDAP_STRDUP(config->lt_cacertdir);
|
||||||
|
+ if (config->lt_ciphersuite)
|
||||||
|
+ copy->lt_ciphersuite = LDAP_STRDUP(config->lt_ciphersuite);
|
||||||
|
+ if (config->lt_crlfile)
|
||||||
|
+ copy->lt_crlfile = LDAP_STRDUP(config->lt_crlfile);
|
||||||
|
+ if (config->lt_randfile)
|
||||||
|
+ copy->lt_randfile = LDAP_STRDUP(config->lt_randfile);
|
||||||
|
+
|
||||||
|
+ copy->lt_protocol_min = config->lt_protocol_min;
|
||||||
|
+
|
||||||
|
+ return copy;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
+tlsm_free_config ( struct ldaptls *config )
|
||||||
|
+{
|
||||||
|
+ assert(config);
|
||||||
|
+
|
||||||
|
+ if (config->lt_certfile)
|
||||||
|
+ LDAP_FREE(config->lt_certfile);
|
||||||
|
+ if (config->lt_keyfile)
|
||||||
|
+ LDAP_FREE(config->lt_keyfile);
|
||||||
|
+ if (config->lt_dhfile)
|
||||||
|
+ LDAP_FREE(config->lt_dhfile);
|
||||||
|
+ if (config->lt_cacertfile)
|
||||||
|
+ LDAP_FREE(config->lt_cacertfile);
|
||||||
|
+ if (config->lt_cacertdir)
|
||||||
|
+ LDAP_FREE(config->lt_cacertdir);
|
||||||
|
+ if (config->lt_ciphersuite)
|
||||||
|
+ LDAP_FREE(config->lt_ciphersuite);
|
||||||
|
+ if (config->lt_crlfile)
|
||||||
|
+ LDAP_FREE(config->lt_crlfile);
|
||||||
|
+ if (config->lt_randfile)
|
||||||
|
+ LDAP_FREE(config->lt_randfile);
|
||||||
|
+
|
||||||
|
+ LDAP_FREE(config);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static tls_ctx *
|
||||||
|
tlsm_ctx_new ( struct ldapoptions *lo )
|
||||||
|
{
|
||||||
|
@@ -1971,7 +2031,7 @@ tlsm_ctx_new ( struct ldapoptions *lo )
|
||||||
|
#ifdef LDAP_R_COMPILE
|
||||||
|
ldap_pvt_thread_mutex_init( &ctx->tc_refmutex );
|
||||||
|
#endif
|
||||||
|
- ctx->tc_config = &lo->ldo_tls_info; /* pointer into lo structure - must have global scope and must not go away before we can do real init */
|
||||||
|
+ ctx->tc_config = NULL; /* populated later by tlsm_ctx_init */
|
||||||
|
ctx->tc_certdb = NULL;
|
||||||
|
ctx->tc_certname = NULL;
|
||||||
|
ctx->tc_pin_file = NULL;
|
||||||
|
@@ -2038,6 +2098,10 @@ tlsm_ctx_free ( tls_ctx *ctx )
|
||||||
|
#ifdef LDAP_R_COMPILE
|
||||||
|
ldap_pvt_thread_mutex_destroy( &c->tc_refmutex );
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+ if ( c->tc_config )
|
||||||
|
+ tlsm_free_config( c->tc_config );
|
||||||
|
+
|
||||||
|
LDAP_FREE( c );
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -2048,6 +2112,7 @@ static int
|
||||||
|
tlsm_ctx_init( struct ldapoptions *lo, struct ldaptls *lt, int is_server )
|
||||||
|
{
|
||||||
|
tlsm_ctx *ctx = (tlsm_ctx *)lo->ldo_tls_ctx;
|
||||||
|
+ ctx->tc_config = tlsm_copy_config(lt);
|
||||||
|
ctx->tc_is_server = is_server;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
@@ -2067,7 +2132,7 @@ tlsm_deferred_ctx_init( void *arg )
|
||||||
|
|
||||||
|
if ( tlsm_deferred_init( ctx ) ) {
|
||||||
|
Debug( LDAP_DEBUG_ANY,
|
||||||
|
- "TLS: could perform TLS system initialization.\n",
|
||||||
|
+ "TLS: could not perform TLS system initialization.\n",
|
||||||
|
0, 0, 0 );
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
@@ -2333,6 +2398,9 @@ tlsm_deferred_ctx_init( void *arg )
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ tlsm_free_config( ctx->tc_config );
|
||||||
|
+ ctx->tc_config = NULL;
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
Name: openldap
|
Name: openldap
|
||||||
Version: 2.4.28
|
Version: 2.4.28
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: LDAP support libraries
|
Summary: LDAP support libraries
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
License: OpenLDAP
|
License: OpenLDAP
|
||||||
@ -33,6 +33,7 @@ Patch5: openldap-ldaprc-currentdir.patch
|
|||||||
Patch6: openldap-userconfig-setgid.patch
|
Patch6: openldap-userconfig-setgid.patch
|
||||||
Patch7: openldap-dns-priority.patch
|
Patch7: openldap-dns-priority.patch
|
||||||
Patch8: openldap-syncrepl-unset-tls-options.patch
|
Patch8: openldap-syncrepl-unset-tls-options.patch
|
||||||
|
Patch9: openldap-nss-deferred-init-copy-params.patch
|
||||||
|
|
||||||
# Fedora specific patches
|
# Fedora specific patches
|
||||||
Patch100: openldap-fedora-systemd.patch
|
Patch100: openldap-fedora-systemd.patch
|
||||||
@ -134,6 +135,7 @@ pushd openldap-%{version}
|
|||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
|
||||||
%patch100 -p1
|
%patch100 -p1
|
||||||
|
|
||||||
@ -649,6 +651,9 @@ exit 0
|
|||||||
%{evolution_connector_prefix}/
|
%{evolution_connector_prefix}/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 31 2012 Jan Vcelak <jvcelak@redhat.com> 2.4.28-3
|
||||||
|
- fix: replication (syncrepl) with TLS causes segfault (#783431)
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.28-2
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.28-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user