From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 11 Apr 2006 18:56:11 +0000 (+0000)
Subject: remove more LDBM cruft
X-Git-Tag: OPENLDAP_REL_ENG_2_4_0ALPHA~3^2~24
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc2ad31bbaec99c04283d971ea5a73ad1dcd6671;p=openldap

remove more LDBM cruft
---

diff --git a/servers/slapd/alock.c b/servers/slapd/alock.c
index b0bb33789f..461f4b556c 100644
--- a/servers/slapd/alock.c
+++ b/servers/slapd/alock.c
@@ -21,7 +21,7 @@
 
 #include "portable.h"
 
-#if SLAPD_BDB || SLAPD_HDB || SLAPD_LDBM
+#if SLAPD_BDB || SLAPD_HDB
 
 #include "alock.h"
 
diff --git a/servers/slapd/back-monitor/database.c b/servers/slapd/back-monitor/database.c
index e50b53ff8a..629248ec79 100644
--- a/servers/slapd/back-monitor/database.c
+++ b/servers/slapd/back-monitor/database.c
@@ -42,9 +42,6 @@ static int monitor_back_add_plugin( monitor_info_t *mi, Backend *be, Entry *e );
 #if defined(SLAPD_LDAP) 
 #include "../back-ldap/back-ldap.h"
 #endif /* defined(SLAPD_LDAP) */
-#if 0 && defined(SLAPD_LDBM) 
-#include "../back-ldbm/back-ldbm.h"
-#endif /* defined(SLAPD_LDBM) */
 #if defined(SLAPD_META) 
 #include "../back-meta/back-meta.h"
 #endif /* defined(SLAPD_META) */
diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 7effba1534..83d042d9b4 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1304,7 +1304,7 @@ rdn_validate( struct berval *rdn )
 
 /* build_new_dn:
  *
- * Used by ldbm/bdb2 back_modrdn to create the new dn of entries being
+ * Used by back-bdb back_modrdn to create the new dn of entries being
  * renamed.
  *
  * new_dn = parent (p_dn) + separator + rdn (newrdn) + null.
diff --git a/servers/slapd/kerberos.c b/servers/slapd/kerberos.c
index 225b8d1421..fd145aaf2f 100644
--- a/servers/slapd/kerberos.c
+++ b/servers/slapd/kerberos.c
@@ -1,4 +1,4 @@
-/* kerberos.c - ldbm backend kerberos bind routines */
+/* kerberos.c - kerberos bind routines */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 19fc5d9cf7..363e5c233c 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1676,8 +1676,7 @@ struct slap_backend_db {
 
 /*
  * define to honor hasSubordinates operational attribute in search filters
- * (in previous use there was a flaw with back-bdb and back-ldbm; now it 
- * is fixed).
+ * (in previous use there was a flaw with back-bdb; now it is fixed).
  */
 #define		be_has_subordinates bd_info->bi_has_subordinates