diff -Naur openldap-2.1.15.dbcachesize/servers/slapd/Makefile.in openldap-2.1.15/servers/slapd/Makefile.in
--- openldap-2.1.15.dbcachesize/servers/slapd/Makefile.in	Sun Feb  9 18:41:27 2003
+++ openldap-2.1.15/servers/slapd/Makefile.in	Thu Mar 13 11:24:19 2003
@@ -362,6 +362,9 @@
 install-conf: FORCE
 	@-$(MKDIR) $(DESTDIR)$(sysconfdir)
 	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data/log
+	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data/data
+	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data/tmp
 	$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
 	if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
 		echo "installing slapd.conf in $(sysconfdir)"; \
diff -Naur openldap-2.1.15.dbcachesize/servers/slapd/back-bdb/back-bdb.h openldap-2.1.15/servers/slapd/back-bdb/back-bdb.h
--- openldap-2.1.15.dbcachesize/servers/slapd/back-bdb/back-bdb.h	Thu Mar 13 10:56:35 2003
+++ openldap-2.1.15/servers/slapd/back-bdb/back-bdb.h	Thu Mar 13 11:05:30 2003
@@ -15,6 +15,7 @@
 LDAP_BEGIN_DECL
 
 /* #define BDB_HIER		1 */
+#define BDB_SUBDIRS	1
 
 #define DN_BASE_PREFIX		SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX	 	'%'
diff -Naur openldap-2.1.15.dbcachesize/servers/slapd/back-bdb/init.c openldap-2.1.15/servers/slapd/back-bdb/init.c
--- openldap-2.1.15.dbcachesize/servers/slapd/back-bdb/init.c	Thu Mar 13 10:52:26 2003
+++ openldap-2.1.15/servers/slapd/back-bdb/init.c	Thu Mar 13 11:21:15 2003
@@ -244,7 +244,7 @@
 			return rc;
 		}
 
-		strcat( &dir[len], BDB_LG_SUBDIR );
+		strcpy( &dir[len], BDB_LG_SUBDIR );
 
 		rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
 		if( rc != 0 ) {
@@ -260,7 +260,7 @@
 			return rc;
 		}
 
-		strcat( &dir[len], BDB_DATA_SUBDIR );
+		strcpy( &dir[len], BDB_DATA_SUBDIR );
 
 		rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
 		if( rc != 0 ) {