From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 26 Mar 1999 22:31:40 +0000 (+0000)
Subject: Apply ldbmcat patch suggested in ITS#85.
X-Git-Tag: OPENLDAP_REL_ENG_1_2_1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecc33d6df393d36644850977deabc335ce6d3106;p=thirdparty%2Fopenldap.git

Apply ldbmcat patch suggested in ITS#85.
Devel needs to be patched separately.  Ksp working on changes.
---

diff --git a/servers/slapd/tools/ldbmcat.c b/servers/slapd/tools/ldbmcat.c
index fb3cbdd137..3d9f5b4ce7 100644
--- a/servers/slapd/tools/ldbmcat.c
+++ b/servers/slapd/tools/ldbmcat.c
@@ -60,9 +60,15 @@ main( int argc, char **argv )
             key = ldbm_nextkey( dbp, last ) )
 #endif
         {
+#ifdef HAVE_BERKELEY_DB2
+				key.flags = 0;
+                data = ldbm_fetch( dbp, key );
+				key.flags = DB_DBT_MALLOC;
+#else
                 if ( last.dptr != NULL )
                         ldbm_datum_free( dbp, last );
                 data = ldbm_fetch( dbp, key );
+#endif
 
                 if (( s = data.dptr ) != NULL ) {
 
@@ -83,8 +89,10 @@ main( int argc, char **argv )
 
                 last = key;
         }
+#ifdef HAVE_BERKELEY_DB2
         if ( last.dptr != NULL )
                 ldbm_datum_free( dbp, last );
+#endif
         ldbm_close( dbp );
 
         exit( 0 );