diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 3069ed7452d25de19f04a6aa593c999a3d86afff..ec95e10a4eeaecf128af5dce19ac2070421b5430 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,4 +1,8 @@
 /* abandon.c - decode and handle an ldap abandon operation */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 15bbcd4fba8b16150251b30e1e3a8a0cafad2c65..76e54530c6ad935ab5b476facf5778b05f7b7f9f 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1,4 +1,8 @@
 /* acl.c - routines to parse and check acl's */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index d12508f6b531b5ae2a1aae0c2231af7d7adeecb5..f31993f2d2c3321dd1a634d37b9f79e206e3cc10 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -1,4 +1,8 @@
 /* acl.c - routines to parse and check acl's */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 4dd63a8c1aecab4c6e13021313c92ac393a3f3bd..981784eaf90f6e857f0060db4a3dab8d00149d62 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 589291b943629a0b3637776316e87f750ca4f07a..74e5c241c5d5efb2e8e66b300375bac690eb5556 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* attr.c - routines for dealing with attributes */
 
 #include "portable.h"
diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 33a70723ddbba269b15e88f66e3726d36eda93d5..dcb4ba8d7b46829a5620589421575cf865efc049 100644
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* ava.c - routines for dealing with attribute value assertions */
 
 #include "portable.h"
diff --git a/servers/slapd/back-ldbm/abandon.c b/servers/slapd/back-ldbm/abandon.c
index ef7409ce62cb884396cdcb218babcbf214dfb158..4fe70427b572be1c8b9be52579807f45a1b24ba7 100644
--- a/servers/slapd/back-ldbm/abandon.c
+++ b/servers/slapd/back-ldbm/abandon.c
@@ -1,4 +1,8 @@
 /* abandon.c - ldbm backend abandon routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index c6f85169c69f3a80892529da57f3ff69307ff60d..0333fe412930907b15f0f1f0bb8d703a1c6dd894 100644
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -1,4 +1,8 @@
 /* add.c - ldap ldbm back-end add routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/attr.c b/servers/slapd/back-ldbm/attr.c
index 1f79fedb65deaa1b97a31419d516495099550bec..aab4b27bdeeb4c4f568ccb37423897df73d10cfb 100644
--- a/servers/slapd/back-ldbm/attr.c
+++ b/servers/slapd/back-ldbm/attr.c
@@ -1,4 +1,8 @@
 /* attr.c - backend routines for dealing with attributes */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index 10cf04ce57adafdea91702febe301d71e0e3f6a0..688f055b05008540f8b969480961b4a95957b741 100644
--- a/servers/slapd/back-ldbm/back-ldbm.h
+++ b/servers/slapd/back-ldbm/back-ldbm.h
@@ -1,8 +1,8 @@
+/* back-ldbm.h - ldap ldbm back-end header file */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
-/* back-ldbm.h - ldap ldbm back-end header file */
 
 #ifndef _BACK_LDBM_H_
 #define _BACK_LDBM_H_
diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index dad6b9e2ac7127bc02a2b481863ad827c031cdbf..6a2efc8f0cb2d5234022d022c4acb27167d23149 100644
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -1,4 +1,8 @@
 /* bind.c - ldbm backend bind and unbind routines */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c
index a355f7142e407f4342bf51e46498dcb2afc4b9ed..530e9d9acfddcbe9cf71f51af4efdcdc36328b89 100644
--- a/servers/slapd/back-ldbm/cache.c
+++ b/servers/slapd/back-ldbm/cache.c
@@ -1,4 +1,8 @@
 /* cache.c - routines to maintain an in-core cache of entries */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/close.c b/servers/slapd/back-ldbm/close.c
index 9e520485d7239d40dd572fe5be1a073552e6d8b5..f5e5442aa52ea9e9bbe88dce2a1f04f9afbe4ad1 100644
--- a/servers/slapd/back-ldbm/close.c
+++ b/servers/slapd/back-ldbm/close.c
@@ -1,4 +1,8 @@
 /* close.c - close ldbm backend */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/compare.c b/servers/slapd/back-ldbm/compare.c
index acc5571e5addbdac4cc7d7ae9e0c5bf0c40406c4..278a806d6fdd7ed034c7d30e554fffe0a102c001 100644
--- a/servers/slapd/back-ldbm/compare.c
+++ b/servers/slapd/back-ldbm/compare.c
@@ -1,4 +1,8 @@
 /* compare.c - ldbm backend compare routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index e31ef72422e2f57ba4b61f213222746f76c70b83..c0b62d890255d88666f74dfa59b8a31f8196d090 100644
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -1,4 +1,8 @@
 /* config.c - ldbm backend configuration file routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/dbcache.c b/servers/slapd/back-ldbm/dbcache.c
index 28004ac225b75c09e938fd60cf2c8cce8c7e8c6e..39d4407c1ee1c56c5757d8fdd65b2b14db70a914 100644
--- a/servers/slapd/back-ldbm/dbcache.c
+++ b/servers/slapd/back-ldbm/dbcache.c
@@ -1,4 +1,8 @@
 /* ldbmcache.c - maintain a cache of open ldbm files */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 53bdd22f7ce89163521825ce43b44903e1bece9a..a8180b3cf16570a17ce6e0fb35f64457a61f3f73 100644
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -1,4 +1,8 @@
 /* delete.c - ldbm backend delete routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/dn2id.c b/servers/slapd/back-ldbm/dn2id.c
index 405ca65b692ccdc72967da6b4c6bd03fdd896e90..04d219d1881f50beec41bb3d18ea123a56b3ee11 100644
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -1,4 +1,8 @@
 /* dn2id.c - routines to deal with the dn2id index */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/entry.c b/servers/slapd/back-ldbm/entry.c
index 717cf68a13ad758b27540f280d672bc1baa38592..503aab692a8a4ff6808490c5fb00b825e5689682 100644
--- a/servers/slapd/back-ldbm/entry.c
+++ b/servers/slapd/back-ldbm/entry.c
@@ -1,4 +1,8 @@
 /* entry.c - ldbm backend entry_release routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/external.h b/servers/slapd/back-ldbm/external.h
index ac9ffe710aead5e15d1757495c7d04e46ae19cff..e48f588623411320c52fc10058ed8832fb0e2215 100644
--- a/servers/slapd/back-ldbm/external.h
+++ b/servers/slapd/back-ldbm/external.h
@@ -2,6 +2,7 @@
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
+
 #ifndef _LDBM_EXTERNAL_H
 #define _LDBM_EXTERNAL_H
 
diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index 65842a34633393bfd4ee3b5a92c3a134464b7a67..074872e6420e00ef873be6fb42da2d1167e24db3 100644
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -1,4 +1,8 @@
 /* filterindex.c - generate the list of candidate entries from a filter */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
index c890cc49e169b918f6bc91f37f638dec90571a3c..252b584166d024f8560a7e7e72662a4323c579cc 100644
--- a/servers/slapd/back-ldbm/group.c
+++ b/servers/slapd/back-ldbm/group.c
@@ -1,4 +1,8 @@
 /* group.c - ldbm backend acl group routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index 55b9d8d5189d3e3c5688f8bfdb08b7505494f7fc..34eeafdf6d7698a9de871af7cce2b9fab0b6d1ea 100644
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -1,4 +1,8 @@
 /* id2children.c - routines to deal with the id2children index */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/id2entry.c b/servers/slapd/back-ldbm/id2entry.c
index d9de7d200b19b8515c924f98f5b3eb70390dc56d..f33630e9cd16253a260ba2d222d9cde74ad6fce0 100644
--- a/servers/slapd/back-ldbm/id2entry.c
+++ b/servers/slapd/back-ldbm/id2entry.c
@@ -1,4 +1,8 @@
 /* id2entry.c - routines to deal with the id2entry index */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index e89e7dbf84ed6a1d3400e222f5deace50ec410e3..0afef2333351f3ab7b2472591a22d97dbbd90ebb 100644
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -1,4 +1,8 @@
 /* idl.c - ldap id list handling routines */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -220,7 +224,6 @@ idl_store(
 	return( rc );
 }
 
-
 /* split the block at id 
  *	locate ID greater than or equal to id.
  */
@@ -645,9 +648,16 @@ idl_insert( ID_BLOCK **idl, ID id, unsigned int maxids )
 	}
 
 	/* make a slot for the new id *//* XXX bubble move XXX */
+#define BUBBLE 1
+#ifdef BUBBLE
 	for ( j = ID_BLOCK_NIDS(*idl); j != i; j-- ) {
 		ID_BLOCK_ID(*idl, j) = ID_BLOCK_ID(*idl, j-1);
 	}
+#else
+	SAFEMEMCPY( &ID_BLOCK_ID(*idl, i), &ID_BLOCK_ID(*idl, i+1), 
+		ID_BLOCK_NIDS(*idl) - i );
+#endif
+
 	ID_BLOCK_ID(*idl, i) = id;
 	ID_BLOCK_NIDS(*idl)++;
 	(void) memset(
diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 1a3a468fc20f606bf17ee4f04f688da72248cf8e..debd1608fb79b11404ebe6e8efc50d2c1192b9c6 100644
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -1,4 +1,8 @@
 /* index.c - routines for dealing with attribute indexes */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 72a0482aa366fdd357a30e1918ad89d0e2a00083..ddfa758dd6f5e0476948e755eab91b2ddafd8e9f 100644
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -1,4 +1,8 @@
 /* init.c - initialize ldbm backend */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/kerberos.c b/servers/slapd/back-ldbm/kerberos.c
index 14ab368db56fd0dcb6bb5547b39f483a9429b4e2..c8e4a54a0a305af600767ebec29ab3d8ee117dfe 100644
--- a/servers/slapd/back-ldbm/kerberos.c
+++ b/servers/slapd/back-ldbm/kerberos.c
@@ -1,4 +1,8 @@
 /* kerberos.c - ldbm backend kerberos bind routines */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c
index 1fe1a19ac349bd8a48123b6ed0b1f5f46201fb92..41197e051317bb6f27e5f4d663643e00d9503c28 100644
--- a/servers/slapd/back-ldbm/modify.c
+++ b/servers/slapd/back-ldbm/modify.c
@@ -1,4 +1,8 @@
 /* modify.c - ldbm backend modify routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index e7a7f83d0348719332e3cb8b021cf3e94b9e29b4..fae002cec01f706798327c1841df88f53f1f8a7f 100644
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -1,4 +1,8 @@
 /* modrdn.c - ldbm backend modrdn routine */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * LDAP v3 newSuperior support. Add new rdn as an attribute.
diff --git a/servers/slapd/back-ldbm/nextid.c b/servers/slapd/back-ldbm/nextid.c
index 34c7bfe5c92c6414ff7b52f7ae078c4066c50f07..d0d259aba85b721b6925585bd16743e5f03adedf 100644
--- a/servers/slapd/back-ldbm/nextid.c
+++ b/servers/slapd/back-ldbm/nextid.c
@@ -1,4 +1,8 @@
 /* id.c - keep track of the next id to be given out */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h
index bac579c37107e65885e84b02240cb484d5fbfa48..e8732bb0fc36a9111de3df8c614ebf97c870fc4a 100644
--- a/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -2,6 +2,7 @@
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
+
 #ifndef _PROTO_BACK_LDBM
 #define _PROTO_BACK_LDBM
 
diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 11171e4039c7578ff40303c33f9e379a93829874..aaefcd3f125dd8cd09c8a5be105492128abdfe95 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -1,4 +1,8 @@
 /* search.c - ldbm backend search function */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/startup.c b/servers/slapd/back-ldbm/startup.c
index 8464876287a54206a143d366fac2a43676bef74d..ec4c9faf1b608555042046abc043ffd1ff0a8bfa 100644
--- a/servers/slapd/back-ldbm/startup.c
+++ b/servers/slapd/back-ldbm/startup.c
@@ -1,4 +1,8 @@
 /* startup.c - startup ldbm backend */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldbm/unbind.c b/servers/slapd/back-ldbm/unbind.c
index 0241a00b354e7a78510eeaee144094f523271416..abf7fdf1c2a41c4da15b0d83f666a83d9db1ac4d 100644
--- a/servers/slapd/back-ldbm/unbind.c
+++ b/servers/slapd/back-ldbm/unbind.c
@@ -1,4 +1,8 @@
 /* unbind.c - handle an ldap unbind operation */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index c8d30afd066efce744304c112c6d58a149fb9c74..0c07a87a9bba3b0526c340a9fd96c1cb1216a67d 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* backend.c - routines for dealing with back-end databases */
 
 
diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 34d617e6273b876232b1622cdc8a74b4b85bc653..8ec91329540ce6545d7f059eb41643dfa52c3953 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -1,4 +1,8 @@
 /* bind.c - decode an ldap bind operation and pass it to a backend db */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 8fa9ce33d1bbb5111c1f656af60de169ae3e942c..27b7cca7696592b287f1f682cd2cb3b55dc7819d 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,4 +1,8 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index e972d22ec426f8f2c5ec8f618b77c8e29bbbb5e3..c7902bb844117499f0c8a99459be7472916779e5 100644
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,4 +1,8 @@
 /* charray.c - routines for dealing with char * arrays */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 61380982ffbe29ce0578333f933779b9b280e212..4e9d46cf81be5342ab963e6c9fd0f1d9a976d718 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index c0bc3fd69d82a562301cdd40562741d8d40a0dd7..ff114775f0eb025fcd4972ea539dd7cdc21134d1 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1,4 +1,8 @@
 /* config.c - configuration file handling routines */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/configinfo.c b/servers/slapd/configinfo.c
index 565a606647e6a7fa7fe1929bd8383b0c2e9cb666..68854d4f367f749ea00804fc8a7b159e32ec9152 100644
--- a/servers/slapd/configinfo.c
+++ b/servers/slapd/configinfo.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index d455c6eafcb26c911e6b1d879fe77a7f27748639..31b1283b61cef0d12e98fdd40d811ca14cb72e8e 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1,3 +1,8 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 2ce6669f2f3856770e7e91b5c5eccc0379c59707..445ba1bcc317d76859d5f0c63c043501d88023df 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1,3 +1,8 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
 #include "portable.h"
 
 #include <stdio.h>
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 0a15eb67a943bc1f6c545c5f5514c22cf886840b..03d9c16ab58578b981b92ab38258d2bf8be76e4d 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index cb356d0639e7d3807a34b7f4b016f1094e6bd4a6..cc88a40bbfe280057996ba0d34a7682612de31ae 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1,4 +1,8 @@
 /* dn.c - routines for dealing with distinguished names */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index ce08b132d1afed1754a8314e0eb3ccfb11df7e52..2954ca36714703f78a5e8dc1eca2bd76454aa21b 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,4 +1,8 @@
 /* entry.c - routines for dealing with entries */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index aa8ee102977ea47d6f10b1756113ad7d92973491..cb830de01413856a9ecfdf115da45999701e8a35 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -1,4 +1,8 @@
 /* filter.c - routines for parsing and dealing with filters */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index 738b66f5b31807eb9e89c508e0307e2d86d50cbb..dd6da92f64142f76849be1a3e248402e353e6352 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -1,4 +1,8 @@
 /* filterentry.c - apply a filter to an entry */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 36face1b28644ed01b155ca09e500cac3f8eb8f9..ea9234ddd0dde82f776722934701a25c752efb3f 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,4 +1,8 @@
 /* init.c - initialize various things */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index fe3a850abd779fe1bf5539babb96368829db2f2d..ac109065a2229f5b9a36726baa4047f3be1865d1 100644
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -1,4 +1,8 @@
 /* lock.c - routines to open and apply an advisory lock to a file */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 5be9cdc5d85683fb559126b760c1de10fcfcf653..c1f8b24ae590c6059234017e7f522a5a9f6ae485 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 729aded31e0c39f3b2c5b3ddc3e30a4058b02bd7..b650ee4a9238d8e14e668763259cf17934d6f39f 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 659be6e99b5ecf12d36d8779e4379e233f426b23..0c6e4d6863bf29b0682a36b81a8288912a37e93f 100644
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 4ca92d801b7ac8a5b48242b4fcf97f1c23d167cb..a4401bced5a7a47ebedebe1518a72ec7aa5daa8f 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,4 +1,8 @@
 /* operation.c - routines to deal with pending ldap operations */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index f5871ee8b814c1f338f5df4cc023f5e8d0d24b8e..f5e402f33039344b794c9c8a665f9f8a912bff10 100644
--- a/servers/slapd/phonetic.c
+++ b/servers/slapd/phonetic.c
@@ -1,4 +1,8 @@
 /* phonetic.c - routines to do phonetic matching */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 122872f92bd42a5ebe2eb49fa53e044396739b96..8f8b6439221e8c499a3e2e655c588532176c4082 100644
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -1,4 +1,8 @@
 /* repl.c - log modifications for replication purposes */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 5ebfe68d357b35160b5f8e6712ac2146df9069a8..8c348193ec15c052874272ad70442f39d165add4 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1,3 +1,8 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
 #include "portable.h"
 
 #include <ac/stdlib.h>
diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 577fbfcbf0dfe3e964ff5c64acb175c4882845ed..44c86656d8bc2ddbf87eae3596e314a35f6a0590 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,4 +1,8 @@
 /* schema.c - routines to enforce schema definitions */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 42aa19d83557391bd6efd384a09beaa513ab68a0..202329978f0562f97dd957ac2bf56f6b541c8940 100644
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -1,4 +1,8 @@
 /* schemaparse.c - routines to parse config file objectclass definitions */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 3fce185f77bd49a5f5953d651ad08b04c91702d7..3c1a3e78fe67a106853f2cd727f24e86a598a15e 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -1,4 +1,8 @@
 /* str2filter.c - parse an rfc 1588 string filter */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/tools/ldif2common.c b/servers/slapd/tools/ldif2common.c
index 566391a66b0289e328868e409eff56305b8a3dd1..3bc52e04a5e099ff88a97fc7ef98c1d998e76707 100644
--- a/servers/slapd/tools/ldif2common.c
+++ b/servers/slapd/tools/ldif2common.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* ldif2common.c - common definitions for the ldif2* tools */
 
 #include "portable.h"
diff --git a/servers/slapd/tools/ldif2common.h b/servers/slapd/tools/ldif2common.h
index 6520cf85927b4ab74e1dc865ddce5ae2d599ace3..0d63a8b7c218377b3493bcfaab1c96a82607e9a7 100644
--- a/servers/slapd/tools/ldif2common.h
+++ b/servers/slapd/tools/ldif2common.h
@@ -1,3 +1,7 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* ldif2common.h - common definitions for the ldif2* tools */
 
 #ifndef LDIF2COMMON_H_
diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index 1af98050ff9874277ca5d5eb7a746802dcbd0417..f54eb8c6db2fa0b33e3930191365253d4415898b 100644
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -40,7 +40,6 @@ main( int argc, char **argv )
 	char		*linep, *buf;
 	char		*args[MAXARGS];
 	char		buf2[20], buf3[20];
-	char		line[BUFSIZ];
 	char		cmd[MAXPATHLEN];
 	int		lineno, elineno;
 	int      	lmax;
diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index da6e1cd7c7dee198905a0fedfe04b2a14a5efd25..4c509860c75de3549c40b848cd13d4f5f7a2a8e9 100644
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -1,4 +1,8 @@
 /* unbind.c - decode an ldap unbind operation and pass it to a backend db */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index acac1ad1637762946fe5282ad50b877a5b8de89d..2613fbcfa42c8095cf77714973a2a3acd4d888d6 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,6 +1,10 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 /* user.c - set user id, group id and group access list
  *
- * Copyright 1999 by PM Lashley and The OpenLDAP Foundation.
+ * Copyright 1999 by PM Lashley.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index ccabdf06a42ae84c2e6250a0591da93e163f6d84..c5564935984c3f9804b92bb37bf6964a09ee6600 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -1,4 +1,8 @@
 /* value.c - routines for dealing with values */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"