Apply back-ldbm/search.c matched initialization bugfix from -devel

to resolve ITS#23.
Update CHANGES & build/version in preparation for OpenLDAP 1.1.2.

diff --git a/CHANGES b/CHANGES
index afad6dfb2daf7662a05702e22b638efa65335a57..ed133c30d402a7b212bea32e900ed249400f4166 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 OpenLDAP Change Log
 
-Changes included in OpenLDAP 1.1.x
-       CVS Tag: OPENLDAP_REL_ENG_1_1
+Changes included in OpenLDAP 1.1.2
+       CVS Tag: OPENLDAP_REL_ENG_1_1_2
        Fixed misc. overlapping strcpy bugs
        Fixed misc. memory leaks
        Fixed slapd/back-ldbm/search matched initialization bug

diff --git a/build/version b/build/version
index 7dd1b56eae025801189d8af5ee3347254c7d815f..2a919a0e083464fdcd60a9878a14c2193364f7cb 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.1.1-Release
+1.1.2-Release

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 6ecf5b4abe5b02cdca58ee9f3fe51151dfdcad5f..438397f441d8dfb5dd3095036c39c350842bdd02 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -49,7 +49,7 @@ ldbm_back_search(
        ID              id;
        Entry           *e;
        Attribute       *ref;
-       char            *matched;
+       char            *matched = NULL;
        int             rmaxsize, nrefs;
        char            *rbuf, *rcur, *r;
        int             nentries = 0;