remove more LDBM cruft

diff --git a/servers/slapd/alock.c b/servers/slapd/alock.c
index b0bb33789fc7801735517184fb13b85e8fd06d66..461f4b556c1eeb0b32b6e7f95620c3ba610e3cb7 100644 (file)
--- 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 e50b53ff8a9701f8e73a0728d389fa4d93fea8a1..629248ec79698cca959f9ace7d5fde6b838f51b1 100644 (file)
--- 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 7effba1534808bad1945ca07ea6d61a21de3f780..83d042d9b4d338e117d22e22ecbe3dce413e6519 100644 (file)
--- 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 225b8d142116a2a1a83b49fe0f51a3d22c4ba4ba..fd145aaf2ff3a44a430d68e908cbc7a759088ec5 100644 (file)
--- 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 19fc5d9cf7076d21331162f44304e8c3c4d69137..363e5c233c04aa7a825ba5d4f8975a977210cd70 100644 (file)
--- 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