Update slapd to use lutil_passwd() for both user and root passwords.

[openldap] / include / ldbm.h

diff --git a/include/ldbm.h b/include/ldbm.h
index 49903713590ff42f21c0c11926934a3f7175083c..0f4c07c3ad8f1f46614d3b26736e97d2d0eec123 100644 (file)
--- a/include/ldbm.h
+++ b/include/ldbm.h
@@ -57,9 +57,7 @@ typedef DB    *LDBM;
 #define LDBM_REPLACE   0
 #define LDBM_SYNC      0x80000000
 
-/* Do not use #elif.  K&R does not support it. */
-#else /* !LDBM_USE_DBBTREE */
-#ifdef LDBM_USE_DBHASH
+#elif defined( LDBM_USE_DBHASH )
 
 /*****************************************************************
  *                                                               *
@@ -110,8 +108,7 @@ typedef DB  *LDBM;
 #define LDBM_REPLACE   0
 #define LDBM_SYNC      0x80000000
 
-#else /* !LDBM_USE_DBHASH */
-#ifdef HAVE_GDBM
+#elif defined( HAVE_GDBM )
 
 /*****************************************************************
  *                                                               *
@@ -142,8 +139,7 @@ extern gdbm_error   gdbm_errno;
 #define LDBM_SYNC      0x80000000
 
 
-#else /* !HAVE_GDBM */
-#ifdef HAVE_NDBM
+#elif defined( HAVE_NDBM )
 
 /*****************************************************************
  *                                                               *
@@ -175,10 +171,7 @@ typedef DBM        *LDBM;
 #define LDBM_REPLACE   DBM_REPLACE
 #define LDBM_SYNC      0
 
-#endif /* HAVE_NDBM */
-#endif /* HAVE_GDBM */
-#endif /* LDBM_USE_DBHASH */
-#endif /* LDBM_USE_DBBTREE */
+#endif
 
 int    ldbm_errno( LDBM ldbm );
 LDBM   ldbm_open( char *name, int rw, int mode, int dbcachesize );