forked from pool/openldap2
4029e81ba3
Not all bugs that gcc14.patch fixed were dealt with in the upstream -- one bug is caused by 0016-Clear-shared-key-only-in-close-function.patch and one bug still remains in the upstream.
26 lines
905 B
Diff
26 lines
905 B
Diff
Index: openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c
|
|
===================================================================
|
|
--- openldap-2.6.7.orig/contrib/slapd-modules/cloak/cloak.c
|
|
+++ openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c
|
|
@@ -242,6 +242,7 @@ cloak_search_response_cb( Operation *op,
|
|
else
|
|
me->e_attrs = a->a_next;
|
|
|
|
+ extern void attr_clean(Attribute *);
|
|
attr_clean( a );
|
|
}
|
|
|
|
Index: openldap-2.6.7/libraries/liblmdb/mdb.c
|
|
===================================================================
|
|
--- openldap-2.6.7.orig/libraries/liblmdb/mdb.c
|
|
+++ openldap-2.6.7/libraries/liblmdb/mdb.c
|
|
@@ -5161,7 +5161,7 @@ mdb_env_close0(MDB_env *env, int excl)
|
|
|
|
// No need to call desctructor anymore, as all pid
|
|
// values are cleared below.
|
|
- env->me_txkey = NULL;
|
|
+ memset(&env->me_txkey, 0, sizeof(env->me_txkey));
|
|
|
|
#ifdef _WIN32
|
|
/* Delete our key from the global list */
|