diff --git a/clients/Makefile.in b/clients/Makefile.in
index f4856e871398a78e7dff950d2dcab3b694b16df5..29f893128516fa4102d6e7c30f777c8de8d87152 100644
--- a/clients/Makefile.in
+++ b/clients/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 ##
diff --git a/clients/fax500/Makefile.in b/clients/fax500/Makefile.in
index 1955d9d4116216e1ddcf3f42666a66f24b6170a3..4520a63ef6c3cd5d7b014b270f1777e8b6732de6 100644
--- a/clients/fax500/Makefile.in
+++ b/clients/fax500/Makefile.in
@@ -1,3 +1,5 @@
+# $OpenLDAP$
+
 PROGRAMS= rp500 fax500 xrpcomp.tmp
 
 SRCS= main.c faxtotpc.c rp500.c
diff --git a/clients/finger/Makefile.in b/clients/finger/Makefile.in
index 4795e639245a459764918b52b31a7acd00b49760..613bda9e409e7440cc4b1f5ccce84418cce6b7b9 100644
--- a/clients/finger/Makefile.in
+++ b/clients/finger/Makefile.in
@@ -1,3 +1,5 @@
+# $OpenLDAP$
+
 SRCS=	main.c
 XSRCS=	version.c
 OBJS=	main.o
diff --git a/clients/gopher/Makefile.in b/clients/gopher/Makefile.in
index b010e426d16d62c724aa27f80a528c2b57b37150..a9d5e4ee949c4f889f3aac17290ae93f7167a745 100644
--- a/clients/gopher/Makefile.in
+++ b/clients/gopher/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ##
 ## Makefile for gopher clients
 ##
diff --git a/clients/mail500/Makefile.in b/clients/mail500/Makefile.in
index 453d1199c76c562b448a6108f8c963d17cfffb08..38b61fd40486f51b193e893b8a1d8737711def70 100644
--- a/clients/mail500/Makefile.in
+++ b/clients/mail500/Makefile.in
@@ -1,3 +1,5 @@
+# $OpenLDAP$
+
 PROGRAMS= mail500
 
 SRCS=	main.c
diff --git a/clients/rcpt500/Makefile.in b/clients/rcpt500/Makefile.in
index fc2ddaa88d722143545f2dd3d256dda3bec4c6b5..5af6536f915447af999b9f5ea226e3a01989e691 100644
--- a/clients/rcpt500/Makefile.in
+++ b/clients/rcpt500/Makefile.in
@@ -1,3 +1,5 @@
+# $OpenLDAP$
+
 PROGRAMS= rcpt500
 SRCS= main.c cmds.c help.c query.c
 XSRCS= version.c
diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index cfd882e58273b5176ae0f24166dfe4dca5575829..11acdd9cff0cb9d04c9c3d2b361837cca4cefd90 100644
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ##
 ## Makefile for LDAP tools
 ##
diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in
index 0eaf5667b8c077eed0b861db631166a4bb8b4420..54c16e29e13ed6144c913d3288bd85c401fdd425 100644
--- a/clients/ud/Makefile.in
+++ b/clients/ud/Makefile.in
@@ -1,3 +1,5 @@
+# $OpenLDAP$
+
 SRCS=	main.c find.c mod.c print.c auth.c util.c help.c \
 	string_to_key.c group.c edit.c globals.c
 XSRCS= version.c
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 8cedf8a18649ca5fc6fc4fb3413efaab93307799..e74ed3238d7a8c7c2599a50ed2f88ec7779008c9 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 ##
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c349a064e41e5b5b9e8015c7711ecf3714981b04..754eee763d458edddb0705ecf87bca4baaa22f8f 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 ##
diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index 7ffb1b9bfa7482cf641415865f7060632a9de71b..d911128bea44eefefcfb8934547097f51521fc94 100644
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
diff --git a/servers/Makefile.in b/servers/Makefile.in
index 6829e7bbb3055620a409f8c4ac67dc0c127390e2..f883a0411bffbb6802e0c1214c8399a1764160dd 100644
--- a/servers/Makefile.in
+++ b/servers/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 9a1d4f2ccc163567c7797fc0c94b2504acaf9720..f9b6154368936dc2d5781e35533bb6a38fcde935 100644
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -226,7 +226,7 @@ dn2id_delete(
 		}
 	}
 
-#if 0
+#if 1
 	{
 		char **subtree = dn_subtree( NULL, dn );
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4a66102e7d41d348de1119610cb62620c50c78e9..d469c700ebde250d80f2f91fc3f901d9f786fd03 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,3 +1,4 @@
+# $OpenLDAP$
 ## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
diff --git a/tests/scripts/acfilter.sh b/tests/scripts/acfilter.sh
index 22c58c3d0a42e1beffaf674da9325876c91ac7cd..7e3659e568860de28ba98a82108cbd1a03ae69c3 100755
--- a/tests/scripts/acfilter.sh
+++ b/tests/scripts/acfilter.sh
@@ -1,2 +1,6 @@
 #! /bin/sh
+# $OpenLDAP$
+#
+# Strip operational attributes
+#
 egrep -iv '^modifiersname:|^modifytimestamp:|^creatorsname:|^createtimestamp'
diff --git a/tests/scripts/all b/tests/scripts/all
index 0b48a448297028aad407d47f7ac2323d40dd7125..bbbcad5c59ca86ae53fcc3d45aeec438e6e1af8f 100755
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 # disable LDAP initialization
 LDAPNOINIT=true; export LDAPNOINIT
diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index f5855c6209222ea62fc333bb8c169b34eda489b6..94238c656d4b13c3ea289abec27a09a27d8b35fa 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+# $OpenLDAP$
 
 DATADIR=$SRCDIR/data
 PROGDIR=./progs
diff --git a/tests/scripts/makeldbm.sh b/tests/scripts/makeldbm.sh
index 06a3d4f3f393632a6c434ffca5c23c09b53cc511..68152bd857022b228f21fcd2f79efc91537bde54 100755
--- a/tests/scripts/makeldbm.sh
+++ b/tests/scripts/makeldbm.sh
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 . scripts/defines.sh
 
diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search
index dc0b751e8ef3281ff1d074b3c098c88376eec540..529ad834570b147193de085dce0b66f08f4d10e9 100755
--- a/tests/scripts/passwd-search
+++ b/tests/scripts/passwd-search
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh
index f2bf20174754bcf548499f1989e9f0bb8b89f83c..442c62fa1cac5dbf2b3eba287108ae05cdb673bc 100755
--- a/tests/scripts/startup_nis_ldap_server.sh
+++ b/tests/scripts/startup_nis_ldap_server.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
-
+#! /bin/sh
+# $OpenLDAP$
 
 if [ $# -eq 0 ]; then
 	SRCDIR="."
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index fd59120f5543385f5b7165a623cd25204df52711..36b3b116cbc0f9ee93abe280e99b80c2fd43b6ea 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 252ce1faa0892284ca66c3a392a2c8b2974b3274..dc358a980e651ef49dce047b40275d55d866a3d3 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index d75319c09c464354cb1b030c9580cc49cef2b418..9fcf18b711181ddfa70e28f1347ec771a18d81a3 100755
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 05b5fe432e004c73b66301fea3efff319dcaafdc..beb69b038fb4b91324d4a24b76bc3207ba017c87 100755
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index f28aa712375b055898a8919be6cb81c4beea32c9..d53673ed1ca0cfef16db2ec9472528d500f79804 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 6193e515c0c1bd87860d2eebbe0dcb310a453733..4b2f5b5fc0a7cb8feda5a5dfd610b4a9bcbd8df1 100755
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index f42683199b7a56a0e35d28538b09004493bbe526..3dd64a892de511af1f43119d2f69859964bed663 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 #
 # Test replication:
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index a7811adcf29c0df818930c97aab888eb1d3fc78b..ce874511aaf1bce9a7e2636ac3affcddbe2265d5 100755
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
 	SRCDIR="."
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index cda35c3c91d581a3276e185dfebb5d17f53ee701..ccd848444e5682ad0117dee671e766b2c2748560 100755
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 #
 # Test default referral