diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2015-05-26 10:33:56 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 10:35:16 +0200 |
| commit | 47ca7a840302a6b4c59c6b1689559de7bdbf9c6b (patch) | |
| tree | 1afdde6cfb61e25534e66c9a67a0545b9504a060 /meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch | |
| parent | 2538cf6f7b2ed384b3880fee2942b7287acfa9d4 (diff) | |
| download | meta-openembedded-contrib-47ca7a840302a6b4c59c6b1689559de7bdbf9c6b.tar.gz | |
openldap: upgrade to 2.4.20
1. upgrade to 2.4.20
2. remove two backup patches
2. integrate two patches to fix CVE-2015-1545 and CVE-2015-1546
3. disable bdb/hdb backend, since BerkeleyDB 6.0.20+ license is
incompatible with LDAP
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch')
| -rw-r--r-- | meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch b/meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch new file mode 100644 index 0000000000..540ba4a635 --- /dev/null +++ b/meta-oe/recipes-support/openldap/openldap-2.4.40/thread_stub.patch @@ -0,0 +1,20 @@ +openldap: set pointer + +When the function ldap_pvt_thread_pool_getkey() succeeds, it +must set the value of *data since the caller may try to use it. + +Upstream-Status: pending + +Signed-off-by: Joe Slater <jslater@windriver.com> + + +--- a/libraries/libldap_r/thr_stub.c ++++ b/libraries/libldap_r/thr_stub.c +@@ -217,6 +217,7 @@ ldap_pvt_thread_pool_unidle ( ldap_pvt_t + int ldap_pvt_thread_pool_getkey ( + void *ctx, void *key, void **data, ldap_pvt_thread_pool_keyfree_t **kfree ) + { ++ if (data) *data = NULL; /* avoid problems with uninitialized *data */ + return(0); + } + |