From 403f4479bc9f9a864122d4aeecf7284408918302 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 8 Sep 1999 19:06:24 +0000
Subject: [PATCH] Add OpenLDAP RCSid to *.[ch] in clients, libraries, and
 servers. Replace old Id as needed (back-tcl). Leave updating of contribWare
 to contributors (for now).

---
 clients/fax500/fax500.h                     | 1 +
 clients/fax500/faxtotpc.c                   | 1 +
 clients/fax500/main.c                       | 1 +
 clients/fax500/rp500.c                      | 1 +
 clients/finger/main.c                       | 1 +
 clients/gopher/go500.c                      | 1 +
 clients/gopher/go500gw.c                    | 1 +
 clients/mail500/main.c                      | 1 +
 clients/rcpt500/cmds.c                      | 1 +
 clients/rcpt500/help.c                      | 1 +
 clients/rcpt500/main.c                      | 1 +
 clients/rcpt500/query.c                     | 1 +
 clients/rcpt500/rcpt500.h                   | 1 +
 clients/tools/ldapdelete.c                  | 1 +
 clients/tools/ldapmodify.c                  | 1 +
 clients/tools/ldapmodrdn.c                  | 1 +
 clients/tools/ldappasswd.c                  | 1 +
 clients/tools/ldapsearch.c                  | 1 +
 clients/ud/auth.c                           | 1 +
 clients/ud/edit.c                           | 1 +
 clients/ud/find.c                           | 1 +
 clients/ud/globals.c                        | 1 +
 clients/ud/group.c                          | 1 +
 clients/ud/help.c                           | 1 +
 clients/ud/main.c                           | 1 +
 clients/ud/mod.c                            | 1 +
 clients/ud/print.c                          | 1 +
 clients/ud/string_to_key.c                  | 3 ++-
 clients/ud/ud.h                             | 1 +
 clients/ud/util.c                           | 1 +
 libraries/libavl/avl.c                      | 1 +
 libraries/libavl/testavl.c                  | 1 +
 libraries/liblber/assert.c                  | 1 +
 libraries/liblber/bprint.c                  | 1 +
 libraries/liblber/decode.c                  | 1 +
 libraries/liblber/dtest.c                   | 1 +
 libraries/liblber/encode.c                  | 1 +
 libraries/liblber/etest.c                   | 1 +
 libraries/liblber/idtest.c                  | 1 +
 libraries/liblber/io.c                      | 1 +
 libraries/liblber/lber-int.h                | 1 +
 libraries/liblber/memory.c                  | 1 +
 libraries/liblber/options.c                 | 1 +
 libraries/liblber/sockbuf.c                 | 1 +
 libraries/libldap/abandon.c                 | 1 +
 libraries/libldap/add.c                     | 1 +
 libraries/libldap/addentry.c                | 1 +
 libraries/libldap/apitest.c                 | 1 +
 libraries/libldap/bind.c                    | 1 +
 libraries/libldap/cache.c                   | 1 +
 libraries/libldap/charray.c                 | 1 +
 libraries/libldap/charset.c                 | 1 +
 libraries/libldap/cldap.c                   | 1 +
 libraries/libldap/compare.c                 | 1 +
 libraries/libldap/controls.c                | 1 +
 libraries/libldap/delete.c                  | 1 +
 libraries/libldap/digest.c                  | 1 +
 libraries/libldap/disptmpl.c                | 1 +
 libraries/libldap/dn.c                      | 1 +
 libraries/libldap/dsparse.c                 | 1 +
 libraries/libldap/error.c                   | 1 +
 libraries/libldap/extended.c                | 1 +
 libraries/libldap/free.c                    | 1 +
 libraries/libldap/friendly.c                | 1 +
 libraries/libldap/getattr.c                 | 1 +
 libraries/libldap/getdn.c                   | 1 +
 libraries/libldap/getdxbyname.c             | 1 +
 libraries/libldap/getentry.c                | 1 +
 libraries/libldap/getfilter.c               | 1 +
 libraries/libldap/getvalues.c               | 1 +
 libraries/libldap/init.c                    | 1 +
 libraries/libldap/kbind.c                   | 1 +
 libraries/libldap/ldap-int.h                | 1 +
 libraries/libldap/messages.c                | 1 +
 libraries/libldap/modify.c                  | 1 +
 libraries/libldap/modrdn.c                  | 1 +
 libraries/libldap/open.c                    | 1 +
 libraries/libldap/options.c                 | 1 +
 libraries/libldap/os-ip.c                   | 1 +
 libraries/libldap/print.c                   | 1 +
 libraries/libldap/references.c              | 1 +
 libraries/libldap/request.c                 | 1 +
 libraries/libldap/result.c                  | 1 +
 libraries/libldap/sasl.c                    | 1 +
 libraries/libldap/sbind.c                   | 1 +
 libraries/libldap/schema.c                  | 1 +
 libraries/libldap/search.c                  | 1 +
 libraries/libldap/sort.c                    | 1 +
 libraries/libldap/srchpref.c                | 1 +
 libraries/libldap/string.c                  | 1 +
 libraries/libldap/test.c                    | 1 +
 libraries/libldap/tls.c                     | 1 +
 libraries/libldap/tmplout.c                 | 1 +
 libraries/libldap/tmpltest.c                | 1 +
 libraries/libldap/ufn.c                     | 1 +
 libraries/libldap/unbind.c                  | 1 +
 libraries/libldap/url.c                     | 1 +
 libraries/libldap/util-int.c                | 1 +
 libraries/libldap_r/rdwr.c                  | 1 +
 libraries/libldap_r/thr_cthreads.c          | 1 +
 libraries/libldap_r/thr_lwp.c               | 1 +
 libraries/libldap_r/thr_nt.c                | 1 +
 libraries/libldap_r/thr_posix.c             | 1 +
 libraries/libldap_r/thr_pth.c               | 1 +
 libraries/libldap_r/thr_sleep.c             | 1 +
 libraries/libldap_r/thr_stub.c              | 1 +
 libraries/libldap_r/thr_thr.c               | 1 +
 libraries/libldbm/ldbm.c                    | 1 +
 libraries/libldif/fetch.c                   | 1 +
 libraries/libldif/line64.c                  | 1 +
 libraries/liblutil/base64.c                 | 1 +
 libraries/liblutil/debug.c                  | 1 +
 libraries/liblutil/detach.c                 | 1 +
 libraries/liblutil/getopt.c                 | 1 +
 libraries/liblutil/getpass.c                | 1 +
 libraries/liblutil/lockf.c                  | 1 +
 libraries/liblutil/md5.c                    | 1 +
 libraries/liblutil/memcmp.c                 | 1 +
 libraries/liblutil/nt_err.c                 | 1 +
 libraries/liblutil/ntservice.c              | 1 +
 libraries/liblutil/passwd.c                 | 1 +
 libraries/liblutil/setproctitle.c           | 1 +
 libraries/liblutil/sha1.c                   | 1 +
 libraries/liblutil/sockpair.c               | 1 +
 libraries/liblutil/tempnam.c                | 1 +
 libraries/liblutil/utils.c                  | 1 +
 servers/ldapd/Version.c                     | 1 +
 servers/ldapd/abandon.c                     | 1 +
 servers/ldapd/add.c                         | 1 +
 servers/ldapd/association.c                 | 1 +
 servers/ldapd/bind.c                        | 1 +
 servers/ldapd/certificate.c                 | 1 +
 servers/ldapd/common.h                      | 1 +
 servers/ldapd/compare.c                     | 1 +
 servers/ldapd/delete.c                      | 1 +
 servers/ldapd/error.c                       | 1 +
 servers/ldapd/kerberos.c                    | 1 +
 servers/ldapd/main.c                        | 1 +
 servers/ldapd/message.c                     | 1 +
 servers/ldapd/modify.c                      | 1 +
 servers/ldapd/modrdn.c                      | 1 +
 servers/ldapd/proto-ldapd.h                 | 1 +
 servers/ldapd/request.c                     | 1 +
 servers/ldapd/result.c                      | 1 +
 servers/ldapd/search.c                      | 1 +
 servers/ldapd/syntax.c                      | 1 +
 servers/ldapd/util.c                        | 1 +
 servers/slapd/abandon.c                     | 1 +
 servers/slapd/acl.c                         | 1 +
 servers/slapd/aclparse.c                    | 1 +
 servers/slapd/add.c                         | 1 +
 servers/slapd/attr.c                        | 1 +
 servers/slapd/ava.c                         | 1 +
 servers/slapd/back-bdb2/abandon.c           | 1 +
 servers/slapd/back-bdb2/add.c               | 1 +
 servers/slapd/back-bdb2/alias.c             | 1 +
 servers/slapd/back-bdb2/attr.c              | 1 +
 servers/slapd/back-bdb2/back-bdb2.h         | 1 +
 servers/slapd/back-bdb2/bind.c              | 1 +
 servers/slapd/back-bdb2/cache.c             | 1 +
 servers/slapd/back-bdb2/close.c             | 1 +
 servers/slapd/back-bdb2/compare.c           | 1 +
 servers/slapd/back-bdb2/config.c            | 1 +
 servers/slapd/back-bdb2/dbcache.c           | 1 +
 servers/slapd/back-bdb2/delete.c            | 1 +
 servers/slapd/back-bdb2/dn2id.c             | 1 +
 servers/slapd/back-bdb2/entry.c             | 1 +
 servers/slapd/back-bdb2/external.h          | 1 +
 servers/slapd/back-bdb2/filterindex.c       | 1 +
 servers/slapd/back-bdb2/group.c             | 1 +
 servers/slapd/back-bdb2/id2children.c       | 1 +
 servers/slapd/back-bdb2/id2entry.c          | 1 +
 servers/slapd/back-bdb2/idl.c               | 1 +
 servers/slapd/back-bdb2/index.c             | 1 +
 servers/slapd/back-bdb2/init.c              | 1 +
 servers/slapd/back-bdb2/kerberos.c          | 1 +
 servers/slapd/back-bdb2/modify.c            | 1 +
 servers/slapd/back-bdb2/modrdn.c            | 1 +
 servers/slapd/back-bdb2/nextid.c            | 1 +
 servers/slapd/back-bdb2/porter.c            | 1 +
 servers/slapd/back-bdb2/proto-back-bdb2.h   | 1 +
 servers/slapd/back-bdb2/search.c            | 1 +
 servers/slapd/back-bdb2/startup.c           | 1 +
 servers/slapd/back-bdb2/timing.c            | 1 +
 servers/slapd/back-bdb2/tools.c             | 1 +
 servers/slapd/back-bdb2/txn.c               | 1 +
 servers/slapd/back-bdb2/txn.h               | 1 +
 servers/slapd/back-bdb2/unbind.c            | 1 +
 servers/slapd/back-ldap/add.c               | 1 +
 servers/slapd/back-ldap/back-ldap.h         | 1 +
 servers/slapd/back-ldap/bind.c              | 1 +
 servers/slapd/back-ldap/compare.c           | 1 +
 servers/slapd/back-ldap/config.c            | 1 +
 servers/slapd/back-ldap/delete.c            | 1 +
 servers/slapd/back-ldap/external.h          | 1 +
 servers/slapd/back-ldap/init.c              | 1 +
 servers/slapd/back-ldap/modify.c            | 1 +
 servers/slapd/back-ldap/modrdn.c            | 1 +
 servers/slapd/back-ldap/search.c            | 1 +
 servers/slapd/back-ldap/unbind.c            | 1 +
 servers/slapd/back-ldbm/abandon.c           | 1 +
 servers/slapd/back-ldbm/add.c               | 1 +
 servers/slapd/back-ldbm/alias.c             | 1 +
 servers/slapd/back-ldbm/attr.c              | 1 +
 servers/slapd/back-ldbm/back-ldbm.h         | 1 +
 servers/slapd/back-ldbm/bind.c              | 1 +
 servers/slapd/back-ldbm/cache.c             | 1 +
 servers/slapd/back-ldbm/close.c             | 1 +
 servers/slapd/back-ldbm/compare.c           | 1 +
 servers/slapd/back-ldbm/config.c            | 1 +
 servers/slapd/back-ldbm/dbcache.c           | 1 +
 servers/slapd/back-ldbm/delete.c            | 1 +
 servers/slapd/back-ldbm/dn2id.c             | 1 +
 servers/slapd/back-ldbm/entry.c             | 1 +
 servers/slapd/back-ldbm/external.h          | 1 +
 servers/slapd/back-ldbm/filterindex.c       | 1 +
 servers/slapd/back-ldbm/group.c             | 1 +
 servers/slapd/back-ldbm/id2children.c       | 1 +
 servers/slapd/back-ldbm/id2entry.c          | 1 +
 servers/slapd/back-ldbm/idl.c               | 1 +
 servers/slapd/back-ldbm/index.c             | 1 +
 servers/slapd/back-ldbm/init.c              | 1 +
 servers/slapd/back-ldbm/kerberos.c          | 1 +
 servers/slapd/back-ldbm/modify.c            | 1 +
 servers/slapd/back-ldbm/modrdn.c            | 1 +
 servers/slapd/back-ldbm/nextid.c            | 1 +
 servers/slapd/back-ldbm/proto-back-ldbm.h   | 1 +
 servers/slapd/back-ldbm/search.c            | 1 +
 servers/slapd/back-ldbm/startup.c           | 1 +
 servers/slapd/back-ldbm/tools.c             | 1 +
 servers/slapd/back-ldbm/unbind.c            | 1 +
 servers/slapd/back-passwd/config.c          | 1 +
 servers/slapd/back-passwd/external.h        | 1 +
 servers/slapd/back-passwd/init.c            | 1 +
 servers/slapd/back-passwd/search.c          | 1 +
 servers/slapd/back-perl/add.c               | 1 +
 servers/slapd/back-perl/bind.c              | 1 +
 servers/slapd/back-perl/close.c             | 1 +
 servers/slapd/back-perl/compare.c           | 1 +
 servers/slapd/back-perl/config.c            | 1 +
 servers/slapd/back-perl/delete.c            | 1 +
 servers/slapd/back-perl/external.h          | 1 +
 servers/slapd/back-perl/init.c              | 1 +
 servers/slapd/back-perl/modify.c            | 1 +
 servers/slapd/back-perl/modrdn.c            | 1 +
 servers/slapd/back-perl/perl_back.h         | 1 +
 servers/slapd/back-perl/search.c            | 1 +
 servers/slapd/back-perl/unbind.c            | 1 +
 servers/slapd/back-shell/abandon.c          | 1 +
 servers/slapd/back-shell/add.c              | 1 +
 servers/slapd/back-shell/bind.c             | 1 +
 servers/slapd/back-shell/compare.c          | 1 +
 servers/slapd/back-shell/config.c           | 1 +
 servers/slapd/back-shell/delete.c           | 1 +
 servers/slapd/back-shell/external.h         | 1 +
 servers/slapd/back-shell/fork.c             | 1 +
 servers/slapd/back-shell/init.c             | 1 +
 servers/slapd/back-shell/modify.c           | 1 +
 servers/slapd/back-shell/modrdn.c           | 1 +
 servers/slapd/back-shell/result.c           | 1 +
 servers/slapd/back-shell/search.c           | 1 +
 servers/slapd/back-shell/shell.h            | 1 +
 servers/slapd/back-shell/unbind.c           | 1 +
 servers/slapd/back-tcl/tcl_abandon.c        | 3 +--
 servers/slapd/back-tcl/tcl_add.c            | 3 +--
 servers/slapd/back-tcl/tcl_bind.c           | 3 +--
 servers/slapd/back-tcl/tcl_close.c          | 3 +--
 servers/slapd/back-tcl/tcl_compare.c        | 3 +--
 servers/slapd/back-tcl/tcl_config.c         | 3 +--
 servers/slapd/back-tcl/tcl_delete.c         | 3 +--
 servers/slapd/back-tcl/tcl_init.c           | 3 +--
 servers/slapd/back-tcl/tcl_modify.c         | 3 +--
 servers/slapd/back-tcl/tcl_modrdn.c         | 3 +--
 servers/slapd/back-tcl/tcl_search.c         | 3 +--
 servers/slapd/back-tcl/tcl_unbind.c         | 3 +--
 servers/slapd/back-tcl/tcl_util.c           | 3 +--
 servers/slapd/backend.c                     | 1 +
 servers/slapd/bind.c                        | 1 +
 servers/slapd/ch_malloc.c                   | 1 +
 servers/slapd/charray.c                     | 1 +
 servers/slapd/compare.c                     | 1 +
 servers/slapd/config.c                      | 1 +
 servers/slapd/configinfo.c                  | 1 +
 servers/slapd/connection.c                  | 1 +
 servers/slapd/controls.c                    | 1 +
 servers/slapd/daemon.c                      | 1 +
 servers/slapd/delete.c                      | 1 +
 servers/slapd/dn.c                          | 1 +
 servers/slapd/entry.c                       | 1 +
 servers/slapd/extended.c                    | 1 +
 servers/slapd/filter.c                      | 1 +
 servers/slapd/filterentry.c                 | 1 +
 servers/slapd/init.c                        | 1 +
 servers/slapd/lock.c                        | 1 +
 servers/slapd/main.c                        | 1 +
 servers/slapd/modify.c                      | 1 +
 servers/slapd/modrdn.c                      | 1 +
 servers/slapd/module.c                      | 1 +
 servers/slapd/monitor.c                     | 1 +
 servers/slapd/nt_svc.c                      | 1 +
 servers/slapd/operation.c                   | 1 +
 servers/slapd/phonetic.c                    | 1 +
 servers/slapd/proto-slap.h                  | 1 +
 servers/slapd/repl.c                        | 1 +
 servers/slapd/result.c                      | 1 +
 servers/slapd/root_dse.c                    | 1 +
 servers/slapd/sasl.c                        | 1 +
 servers/slapd/schema.c                      | 1 +
 servers/slapd/schemaparse.c                 | 1 +
 servers/slapd/search.c                      | 1 +
 servers/slapd/shell-backends/passwd-shell.c | 1 +
 servers/slapd/shell-backends/passwd-shell.h | 1 +
 servers/slapd/shell-backends/pwd-Version.c  | 1 +
 servers/slapd/shell-backends/shellutil.c    | 1 +
 servers/slapd/shell-backends/shellutil.h    | 1 +
 servers/slapd/slap.h                        | 1 +
 servers/slapd/str2filter.c                  | 1 +
 servers/slapd/suffixalias.c                 | 1 +
 servers/slapd/tools/centipede.c             | 1 +
 servers/slapd/tools/chlog2replog.c          | 1 +
 servers/slapd/tools/edb2ldif.c              | 1 +
 servers/slapd/tools/ldapsyntax.c            | 1 +
 servers/slapd/tools/ldapsyntax.h            | 1 +
 servers/slapd/tools/ldbmtest.c              | 1 +
 servers/slapd/tools/ldif.c                  | 1 +
 servers/slapd/tools/mimic.c                 | 1 +
 servers/slapd/tools/sizecount.c             | 1 +
 servers/slapd/tools/slapadd.c               | 1 +
 servers/slapd/tools/slapcat.c               | 1 +
 servers/slapd/tools/slapcommon.c            | 1 +
 servers/slapd/tools/slapcommon.h            | 1 +
 servers/slapd/tools/slapindex.c             | 1 +
 servers/slapd/unbind.c                      | 1 +
 servers/slapd/user.c                        | 1 +
 servers/slapd/value.c                       | 1 +
 servers/slurpd/admin.c                      | 1 +
 servers/slurpd/args.c                       | 1 +
 servers/slurpd/ch_malloc.c                  | 1 +
 servers/slurpd/config.c                     | 1 +
 servers/slurpd/fm.c                         | 1 +
 servers/slurpd/globals.c                    | 1 +
 servers/slurpd/globals.h                    | 1 +
 servers/slurpd/ldap_op.c                    | 1 +
 servers/slurpd/lock.c                       | 1 +
 servers/slurpd/main.c                       | 1 +
 servers/slurpd/proto-slurp.h                | 1 +
 servers/slurpd/re.c                         | 1 +
 servers/slurpd/reject.c                     | 1 +
 servers/slurpd/replica.c                    | 1 +
 servers/slurpd/replog.c                     | 1 +
 servers/slurpd/ri.c                         | 1 +
 servers/slurpd/rq.c                         | 1 +
 servers/slurpd/sanity.c                     | 1 +
 servers/slurpd/slurp.h                      | 1 +
 servers/slurpd/st.c                         | 1 +
 355 files changed, 356 insertions(+), 27 deletions(-)

diff --git a/clients/fax500/fax500.h b/clients/fax500/fax500.h
index 74c8809678..f494e107b6 100644
--- a/clients/fax500/fax500.h
+++ b/clients/fax500/fax500.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef FAX500_H
 #define FAX500_H 1
 
diff --git a/clients/fax500/faxtotpc.c b/clients/fax500/faxtotpc.c
index 797c6fe5a1..1579c84fde 100644
--- a/clients/fax500/faxtotpc.c
+++ b/clients/fax500/faxtotpc.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1993 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/fax500/main.c b/clients/fax500/main.c
index 84cded263e..b94a1a6215 100644
--- a/clients/fax500/main.c
+++ b/clients/fax500/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/fax500/rp500.c b/clients/fax500/rp500.c
index bc80325305..e957483a80 100644
--- a/clients/fax500/rp500.c
+++ b/clients/fax500/rp500.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/finger/main.c b/clients/finger/main.c
index 63b77e9a4b..5e84fe4916 100644
--- a/clients/finger/main.c
+++ b/clients/finger/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990,1994 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c
index a7e9b868be..e8342fc4a6 100644
--- a/clients/gopher/go500.c
+++ b/clients/gopher/go500.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index 533dea8a72..c1c5ab4a9e 100644
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/mail500/main.c b/clients/mail500/main.c
index b3b3f446e2..064ed64c34 100644
--- a/clients/mail500/main.c
+++ b/clients/mail500/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/rcpt500/cmds.c b/clients/rcpt500/cmds.c
index ef7a73bf3b..8e33658a33 100644
--- a/clients/rcpt500/cmds.c
+++ b/clients/rcpt500/cmds.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * cmds.c: command table for rcpt500 (X.500 email query responder)
  *
diff --git a/clients/rcpt500/help.c b/clients/rcpt500/help.c
index 31efcb1635..76dca44f8f 100644
--- a/clients/rcpt500/help.c
+++ b/clients/rcpt500/help.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * help.c: for rcpt500 (X.500 email query responder)
  *
diff --git a/clients/rcpt500/main.c b/clients/rcpt500/main.c
index 74fe9d088d..afabd89322 100644
--- a/clients/rcpt500/main.c
+++ b/clients/rcpt500/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * main.c: for rcpt500 (X.500 email query responder)
  *
diff --git a/clients/rcpt500/query.c b/clients/rcpt500/query.c
index dac5f15fc9..157b5a4baf 100644
--- a/clients/rcpt500/query.c
+++ b/clients/rcpt500/query.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * query.c: for rcpt500 (X.500 email query responder)
  *
diff --git a/clients/rcpt500/rcpt500.h b/clients/rcpt500/rcpt500.h
index c8d4da822d..068af6026b 100644
--- a/clients/rcpt500/rcpt500.h
+++ b/clients/rcpt500/rcpt500.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * rcpt500.h: includes for rcpt500 (X.500 email query responder)
  *
diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index c69bf02d86..54778c42c8 100644
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -1,4 +1,5 @@
 /* ldapdelete.c - simple program to delete an entry using LDAP */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 8ad142745b..62746cc508 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 7246d334d1..3bc2e3140d 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index e9c51e3767..98aa570fed 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 51e8639270..1eba56399a 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/clients/ud/auth.c b/clients/ud/auth.c
index 378c1b78ac..b757d78169 100644
--- a/clients/ud/auth.c
+++ b/clients/ud/auth.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1991, 1992 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/edit.c b/clients/ud/edit.c
index 997926c23d..67f2ed9a86 100644
--- a/clients/ud/edit.c
+++ b/clients/ud/edit.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1994  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/find.c b/clients/ud/find.c
index 437c78fbff..5e8b865603 100644
--- a/clients/ud/find.c
+++ b/clients/ud/find.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1991, 1992, 1993 
  * Regents of the University of Michigan.  All rights reserved.
diff --git a/clients/ud/globals.c b/clients/ud/globals.c
index 9e76d94a24..5927351c5b 100644
--- a/clients/ud/globals.c
+++ b/clients/ud/globals.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1992, 1993, 1994  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/group.c b/clients/ud/group.c
index 3b7a87fb1c..950631d765 100644
--- a/clients/ud/group.c
+++ b/clients/ud/group.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1993, 1994  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/help.c b/clients/ud/help.c
index 2a2c96bde9..027e168e41 100644
--- a/clients/ud/help.c
+++ b/clients/ud/help.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1992, 1993  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/main.c b/clients/ud/main.c
index 6be4288ae5..7f0d4baa3d 100644
--- a/clients/ud/main.c
+++ b/clients/ud/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/clients/ud/mod.c b/clients/ud/mod.c
index 9f6322572e..40eea36316 100644
--- a/clients/ud/mod.c
+++ b/clients/ud/mod.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1991,1993  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/clients/ud/print.c b/clients/ud/print.c
index ca6fca2b70..8cb5c133dc 100644
--- a/clients/ud/print.c
+++ b/clients/ud/print.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1991, 1993 
  * Regents of the University of Michigan.  All rights reserved.
diff --git a/clients/ud/string_to_key.c b/clients/ud/string_to_key.c
index 9160afba30..8a6a5ae70f 100644
--- a/clients/ud/string_to_key.c
+++ b/clients/ud/string_to_key.c
@@ -1,9 +1,10 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 
 #if defined(HAVE_KERBEROS) && !defined(openbsd)
 /*
  * $Source: /repo/OpenLDAP/pkg/ldap/clients/ud/string_to_key.c,v $
- * $Author: kdz $
+ * $Author: hallvard $
  *
  * Copyright 1985, 1986, 1987, 1988, 1989 by the Massachusetts Institute
  * of Technology.
diff --git a/clients/ud/ud.h b/clients/ud/ud.h
index 3f9e6087dc..fa07c3531d 100644
--- a/clients/ud/ud.h
+++ b/clients/ud/ud.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/clients/ud/util.c b/clients/ud/util.c
index 2efd2895d6..27023de759 100644
--- a/clients/ud/util.c
+++ b/clients/ud/util.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1992, 1993  Regents of the University of Michigan.
  * All rights reserved.
diff --git a/libraries/libavl/avl.c b/libraries/libavl/avl.c
index 3b6c113ccc..eb30049ef4 100644
--- a/libraries/libavl/avl.c
+++ b/libraries/libavl/avl.c
@@ -1,4 +1,5 @@
 /* avl.c - routines to implement an avl tree */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libavl/testavl.c b/libraries/libavl/testavl.c
index bd6d35bf01..94540c304d 100644
--- a/libraries/libavl/testavl.c
+++ b/libraries/libavl/testavl.c
@@ -1,4 +1,5 @@
 /* testavl.c - Test Tim Howes AVL code */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/libraries/liblber/assert.c b/libraries/liblber/assert.c
index f71df23435..50b70dd53b 100644
--- a/libraries/liblber/assert.c
+++ b/libraries/liblber/assert.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index 4648678194..eb8808563c 100644
--- a/libraries/liblber/bprint.c
+++ b/libraries/liblber/bprint.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index 6c6bb38b37..e2c204d793 100644
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -1,4 +1,5 @@
 /* decode.c - ber input decoding routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/dtest.c b/libraries/liblber/dtest.c
index 30d803eb93..749958b1ee 100644
--- a/libraries/liblber/dtest.c
+++ b/libraries/liblber/dtest.c
@@ -1,4 +1,5 @@
 /* dtest.c - lber decoding test program */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/encode.c b/libraries/liblber/encode.c
index 85ad0367d8..ef515a3369 100644
--- a/libraries/liblber/encode.c
+++ b/libraries/liblber/encode.c
@@ -1,4 +1,5 @@
 /* encode.c - ber output encoding routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/etest.c b/libraries/liblber/etest.c
index be5e7900dc..9d235b8554 100644
--- a/libraries/liblber/etest.c
+++ b/libraries/liblber/etest.c
@@ -1,4 +1,5 @@
 /* test.c - lber encoding test program */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/idtest.c b/libraries/liblber/idtest.c
index 83d8ec7ace..2bc6822971 100644
--- a/libraries/liblber/idtest.c
+++ b/libraries/liblber/idtest.c
@@ -1,4 +1,5 @@
 /* idtest.c - ber decoding test program using isode libraries */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index 3e5c646a6f..830c16e5f0 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -1,4 +1,5 @@
 /* io.c - ber general i/o routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/lber-int.h b/libraries/liblber/lber-int.h
index c1a8675eba..7d080349f5 100644
--- a/libraries/liblber/lber-int.h
+++ b/libraries/liblber/lber-int.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c
index 312ab796fd..604e8ccc94 100644
--- a/libraries/liblber/memory.c
+++ b/libraries/liblber/memory.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 160aac597d..4ffea28b1d 100644
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c
index 900ff04bdb..30bceb6bed 100644
--- a/libraries/liblber/sockbuf.c
+++ b/libraries/liblber/sockbuf.c
@@ -1,4 +1,5 @@
 /* sockbuf.c - i/o routines with support for adding i/o layers. */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 04066e4882..0541dd93cc 100644
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index 748803de33..aa69653572 100644
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/addentry.c b/libraries/libldap/addentry.c
index 13b0e0224d..1249157f0d 100644
--- a/libraries/libldap/addentry.c
+++ b/libraries/libldap/addentry.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/apitest.c b/libraries/libldap/apitest.c
index 94ba779400..b14f563d4b 100644
--- a/libraries/libldap/apitest.c
+++ b/libraries/libldap/apitest.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/bind.c b/libraries/libldap/bind.c
index 6f807e789e..b9579f2b4a 100644
--- a/libraries/libldap/bind.c
+++ b/libraries/libldap/bind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/cache.c b/libraries/libldap/cache.c
index 43feaadbd4..0e01394a90 100644
--- a/libraries/libldap/cache.c
+++ b/libraries/libldap/cache.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/charray.c b/libraries/libldap/charray.c
index 538aa02a4f..6be3152427 100644
--- a/libraries/libldap/charray.c
+++ b/libraries/libldap/charray.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/charset.c b/libraries/libldap/charset.c
index 91cf3e2429..7d85f5ad79 100644
--- a/libraries/libldap/charset.c
+++ b/libraries/libldap/charset.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index 96589c4038..de6208136b 100644
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 767581a6ef..e7ddcc70aa 100644
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c
index d2b99dd7e9..cc07664c90 100644
--- a/libraries/libldap/controls.c
+++ b/libraries/libldap/controls.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 0413c235cf..6d463e17f6 100644
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/digest.c b/libraries/libldap/digest.c
index e3c784b3e9..69aa80c120 100644
--- a/libraries/libldap/digest.c
+++ b/libraries/libldap/digest.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/disptmpl.c b/libraries/libldap/disptmpl.c
index 32c253d32d..40c2b77343 100644
--- a/libraries/libldap/disptmpl.c
+++ b/libraries/libldap/disptmpl.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/dn.c b/libraries/libldap/dn.c
index c01a8c9620..fc1c6ead88 100644
--- a/libraries/libldap/dn.c
+++ b/libraries/libldap/dn.c
@@ -1,4 +1,5 @@
 /* dn.c - routines for dealing with distinguished names */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/dsparse.c b/libraries/libldap/dsparse.c
index 2d7a7e0219..336025db55 100644
--- a/libraries/libldap/dsparse.c
+++ b/libraries/libldap/dsparse.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index ad1bcd7710..ff15bfe462 100644
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index a8ca02b29e..e284b485fd 100644
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/free.c b/libraries/libldap/free.c
index ae208894d0..120e1605b0 100644
--- a/libraries/libldap/free.c
+++ b/libraries/libldap/free.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/friendly.c b/libraries/libldap/friendly.c
index 8fb2faf408..ec37982a70 100644
--- a/libraries/libldap/friendly.c
+++ b/libraries/libldap/friendly.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 1af9881381..079db4b9f3 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 96a28a5a6e..0110e298e7 100644
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/getdxbyname.c b/libraries/libldap/getdxbyname.c
index 1ceffd4c68..602721a05e 100644
--- a/libraries/libldap/getdxbyname.c
+++ b/libraries/libldap/getdxbyname.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 6e5d15eb68..09721f1d8e 100644
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/getfilter.c b/libraries/libldap/getfilter.c
index eac26d998b..efafeb5067 100644
--- a/libraries/libldap/getfilter.c
+++ b/libraries/libldap/getfilter.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/getvalues.c b/libraries/libldap/getvalues.c
index 1ac26f447a..a5d5f0ee9d 100644
--- a/libraries/libldap/getvalues.c
+++ b/libraries/libldap/getvalues.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 8546a348e0..69ffdec8ef 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index 5e63698ddc..731a8b5fc6 100644
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 155e916215..ab446da5a9 100644
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/messages.c b/libraries/libldap/messages.c
index 33091da163..57e331daeb 100644
--- a/libraries/libldap/messages.c
+++ b/libraries/libldap/messages.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/modify.c b/libraries/libldap/modify.c
index 583f919ddb..a758fc1607 100644
--- a/libraries/libldap/modify.c
+++ b/libraries/libldap/modify.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index a8998b2bf8..209ec4315a 100644
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 93019b0915..e8785387f5 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/options.c b/libraries/libldap/options.c
index 0d978e3274..12edf629fc 100644
--- a/libraries/libldap/options.c
+++ b/libraries/libldap/options.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 71fac706f1..2eb1c02eff 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/print.c b/libraries/libldap/print.c
index 6de56dc0c9..a6616c53ec 100644
--- a/libraries/libldap/print.c
+++ b/libraries/libldap/print.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index 4ec4d91bb6..371919db10 100644
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index a807d9c2e0..07da8e9bce 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index a004f51440..a47e0577e9 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index eaf32b1a80..a397288c4d 100644
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/sbind.c b/libraries/libldap/sbind.c
index a5c7e5c441..96d9a78433 100644
--- a/libraries/libldap/sbind.c
+++ b/libraries/libldap/sbind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/schema.c b/libraries/libldap/schema.c
index d3fb9a836c..78fbe8a3fa 100644
--- a/libraries/libldap/schema.c
+++ b/libraries/libldap/schema.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index b9a7d7d896..f6d84d10d1 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/sort.c b/libraries/libldap/sort.c
index d7ea4e434f..c62961b773 100644
--- a/libraries/libldap/sort.c
+++ b/libraries/libldap/sort.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/srchpref.c b/libraries/libldap/srchpref.c
index 5fbe662af8..adfca3de10 100644
--- a/libraries/libldap/srchpref.c
+++ b/libraries/libldap/srchpref.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/string.c b/libraries/libldap/string.c
index d785f8d3bb..cd9994ad06 100644
--- a/libraries/libldap/string.c
+++ b/libraries/libldap/string.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/test.c b/libraries/libldap/test.c
index e5178bbdc6..d52859042b 100644
--- a/libraries/libldap/test.c
+++ b/libraries/libldap/test.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index c633ac084e..0a6f47fe22 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index 06c8fe33cd..8b480a3ef5 100644
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/tmpltest.c b/libraries/libldap/tmpltest.c
index b796933488..bbdae7fa1a 100644
--- a/libraries/libldap/tmpltest.c
+++ b/libraries/libldap/tmpltest.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c
index da95c7ba63..9d215cdec9 100644
--- a/libraries/libldap/ufn.c
+++ b/libraries/libldap/ufn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 93ce360d75..852926f785 100644
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c
index 988bac7d45..b632c688f8 100644
--- a/libraries/libldap/url.c
+++ b/libraries/libldap/url.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index c5d17fc4dd..a3128e6e17 100644
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldap_r/rdwr.c b/libraries/libldap_r/rdwr.c
index 74cf915197..ab31f426ae 100644
--- a/libraries/libldap_r/rdwr.c
+++ b/libraries/libldap_r/rdwr.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
 ** This is an improved implementation of Reader/Writer locks does
 ** not protect writers from starvation.  That is, if a writer is
diff --git a/libraries/libldap_r/thr_cthreads.c b/libraries/libldap_r/thr_cthreads.c
index 5eda39c798..8d3949aa98 100644
--- a/libraries/libldap_r/thr_cthreads.c
+++ b/libraries/libldap_r/thr_cthreads.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/libldap_r/thr_lwp.c b/libraries/libldap_r/thr_lwp.c
index a401b1929a..3c1dff3389 100644
--- a/libraries/libldap_r/thr_lwp.c
+++ b/libraries/libldap_r/thr_lwp.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index 21f13991b4..20cca306ea 100644
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap_r/thr_posix.c
index fc92f2385e..c44bee48c3 100644
--- a/libraries/libldap_r/thr_posix.c
+++ b/libraries/libldap_r/thr_posix.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/libldap_r/thr_pth.c b/libraries/libldap_r/thr_pth.c
index fdffc531cf..132644cff0 100644
--- a/libraries/libldap_r/thr_pth.c
+++ b/libraries/libldap_r/thr_pth.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/libldap_r/thr_sleep.c b/libraries/libldap_r/thr_sleep.c
index 1408acb8a1..fac90d0825 100644
--- a/libraries/libldap_r/thr_sleep.c
+++ b/libraries/libldap_r/thr_sleep.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/libraries/libldap_r/thr_stub.c b/libraries/libldap_r/thr_stub.c
index 3909ebe238..60da3cec1f 100644
--- a/libraries/libldap_r/thr_stub.c
+++ b/libraries/libldap_r/thr_stub.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/libldap_r/thr_thr.c b/libraries/libldap_r/thr_thr.c
index eb7a5a16f1..bb3b10d6b7 100644
--- a/libraries/libldap_r/thr_thr.c
+++ b/libraries/libldap_r/thr_thr.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/libldbm/ldbm.c b/libraries/libldbm/ldbm.c
index 9da0579fbf..461db8657e 100644
--- a/libraries/libldbm/ldbm.c
+++ b/libraries/libldbm/ldbm.c
@@ -1,4 +1,5 @@
 /* ldbm.c - ldap dbm compatibility routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldif/fetch.c b/libraries/libldif/fetch.c
index a3aaac1916..94d0861455 100644
--- a/libraries/libldif/fetch.c
+++ b/libraries/libldif/fetch.c
@@ -1,4 +1,5 @@
 /* line64.c - routines for dealing with the slapd line format */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/libldif/line64.c b/libraries/libldif/line64.c
index 83da86f45d..f2a8e995ed 100644
--- a/libraries/libldif/line64.c
+++ b/libraries/libldif/line64.c
@@ -1,4 +1,5 @@
 /* line64.c - routines for dealing with the slapd line format */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/base64.c b/libraries/liblutil/base64.c
index e837088347..d4e107b621 100644
--- a/libraries/liblutil/base64.c
+++ b/libraries/liblutil/base64.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/debug.c b/libraries/liblutil/debug.c
index 7dc1a11e37..a6fc5064d2 100644
--- a/libraries/liblutil/debug.c
+++ b/libraries/liblutil/debug.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/detach.c b/libraries/liblutil/detach.c
index a398ed356a..c4f2aa4478 100644
--- a/libraries/liblutil/detach.c
+++ b/libraries/liblutil/detach.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990, 1994 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/libraries/liblutil/getopt.c b/libraries/liblutil/getopt.c
index 2294dcf519..3b0ca476a5 100644
--- a/libraries/liblutil/getopt.c
+++ b/libraries/liblutil/getopt.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/getpass.c b/libraries/liblutil/getpass.c
index 6efd3f00d4..ce8f6de8c8 100644
--- a/libraries/liblutil/getpass.c
+++ b/libraries/liblutil/getpass.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/lockf.c b/libraries/liblutil/lockf.c
index f37d71a34e..a3424ba146 100644
--- a/libraries/liblutil/lockf.c
+++ b/libraries/liblutil/lockf.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
diff --git a/libraries/liblutil/md5.c b/libraries/liblutil/md5.c
index 0109b1c652..6758de0240 100644
--- a/libraries/liblutil/md5.c
+++ b/libraries/liblutil/md5.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/memcmp.c b/libraries/liblutil/memcmp.c
index 99daac2d0b..eed4b89dee 100644
--- a/libraries/liblutil/memcmp.c
+++ b/libraries/liblutil/memcmp.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 
 #include <ac/string.h>
diff --git a/libraries/liblutil/nt_err.c b/libraries/liblutil/nt_err.c
index 7d4b3b2768..6d119d2b3d 100644
--- a/libraries/liblutil/nt_err.c
+++ b/libraries/liblutil/nt_err.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 
 #ifdef HAVE_WINSOCK2
diff --git a/libraries/liblutil/ntservice.c b/libraries/liblutil/ntservice.c
index 57ab8c89f9..e1554a5cb4 100644
--- a/libraries/liblutil/ntservice.c
+++ b/libraries/liblutil/ntservice.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index 8fc16c2a01..d350770ef9 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/setproctitle.c b/libraries/liblutil/setproctitle.c
index a103337154..6d1ab6a032 100644
--- a/libraries/liblutil/setproctitle.c
+++ b/libraries/liblutil/setproctitle.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 
 #ifndef HAVE_SETPROCTITLE
diff --git a/libraries/liblutil/sha1.c b/libraries/liblutil/sha1.c
index bdaafda162..f8c38a1a66 100644
--- a/libraries/liblutil/sha1.c
+++ b/libraries/liblutil/sha1.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/sockpair.c b/libraries/liblutil/sockpair.c
index b8c7b2bd25..39bcde0fb0 100644
--- a/libraries/liblutil/sockpair.c
+++ b/libraries/liblutil/sockpair.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/libraries/liblutil/tempnam.c b/libraries/liblutil/tempnam.c
index 61d9435322..024f1fd725 100644
--- a/libraries/liblutil/tempnam.c
+++ b/libraries/liblutil/tempnam.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 
 #ifndef HAVE_TEMPNAM
diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c
index 8bd298facf..0f0f3704a2 100644
--- a/libraries/liblutil/utils.c
+++ b/libraries/liblutil/utils.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/ldapd/Version.c b/servers/ldapd/Version.c
index 52afd69861..26392d7385 100644
--- a/servers/ldapd/Version.c
+++ b/servers/ldapd/Version.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1991 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/abandon.c b/servers/ldapd/abandon.c
index 22960c0277..0488593a2f 100644
--- a/servers/ldapd/abandon.c
+++ b/servers/ldapd/abandon.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/add.c b/servers/ldapd/add.c
index 4b1b6806b1..c6ad418836 100644
--- a/servers/ldapd/add.c
+++ b/servers/ldapd/add.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/association.c b/servers/ldapd/association.c
index 3ca61c9e47..d704851d3c 100644
--- a/servers/ldapd/association.c
+++ b/servers/ldapd/association.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/bind.c b/servers/ldapd/bind.c
index 1d83e1c060..8235656c7d 100644
--- a/servers/ldapd/bind.c
+++ b/servers/ldapd/bind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/certificate.c b/servers/ldapd/certificate.c
index be12fed134..59030469fc 100644
--- a/servers/ldapd/certificate.c
+++ b/servers/ldapd/certificate.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * certificate.c - ldap version of quipu certificate syntax handler
  *		   donated by Eric Rosenquist and BNR
diff --git a/servers/ldapd/common.h b/servers/ldapd/common.h
index 9c7f567d61..9acd75e853 100644
--- a/servers/ldapd/common.h
+++ b/servers/ldapd/common.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/compare.c b/servers/ldapd/compare.c
index b0b8d339b8..721c892468 100644
--- a/servers/ldapd/compare.c
+++ b/servers/ldapd/compare.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/delete.c b/servers/ldapd/delete.c
index fbc6ac0737..c4a5da9ae2 100644
--- a/servers/ldapd/delete.c
+++ b/servers/ldapd/delete.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/error.c b/servers/ldapd/error.c
index a93590fc3e..bd15803b0a 100644
--- a/servers/ldapd/error.c
+++ b/servers/ldapd/error.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/kerberos.c b/servers/ldapd/kerberos.c
index e0de204479..af331266f3 100644
--- a/servers/ldapd/kerberos.c
+++ b/servers/ldapd/kerberos.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/main.c b/servers/ldapd/main.c
index b013dffd3e..5badc56bee 100644
--- a/servers/ldapd/main.c
+++ b/servers/ldapd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990-1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/message.c b/servers/ldapd/message.c
index 228e29272c..f9aa99309e 100644
--- a/servers/ldapd/message.c
+++ b/servers/ldapd/message.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/modify.c b/servers/ldapd/modify.c
index 2c86978ee2..9e36928ca3 100644
--- a/servers/ldapd/modify.c
+++ b/servers/ldapd/modify.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/modrdn.c b/servers/ldapd/modrdn.c
index 1dfa005b7a..b9053cd341 100644
--- a/servers/ldapd/modrdn.c
+++ b/servers/ldapd/modrdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/proto-ldapd.h b/servers/ldapd/proto-ldapd.h
index 21bb8b4655..ced8f1be8f 100644
--- a/servers/ldapd/proto-ldapd.h
+++ b/servers/ldapd/proto-ldapd.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _PROTO_LDAPD_H
 #define _PROTO_LDAPD_H
 
diff --git a/servers/ldapd/request.c b/servers/ldapd/request.c
index 8753cd38a0..95598ff28a 100644
--- a/servers/ldapd/request.c
+++ b/servers/ldapd/request.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/result.c b/servers/ldapd/result.c
index a046a4e620..29ebd3e1bb 100644
--- a/servers/ldapd/result.c
+++ b/servers/ldapd/result.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/search.c b/servers/ldapd/search.c
index b57bdbe56c..4ad1a3de8c 100644
--- a/servers/ldapd/search.c
+++ b/servers/ldapd/search.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/syntax.c b/servers/ldapd/syntax.c
index 4658360289..005fb78d6b 100644
--- a/servers/ldapd/syntax.c
+++ b/servers/ldapd/syntax.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/ldapd/util.c b/servers/ldapd/util.c
index 84be225b9e..4403be4fa5 100644
--- a/servers/ldapd/util.c
+++ b/servers/ldapd/util.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 359811e94a..3340bc70f7 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,4 +1,5 @@
 /* abandon.c - decode and handle an ldap abandon operation */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 93690501c4..99b4283266 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1,4 +1,5 @@
 /* acl.c - routines to parse and check acl's */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 3f92c707b6..a134506908 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -1,4 +1,5 @@
 /* acl.c - routines to parse and check acl's */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index d02c9f4501..388ad9d629 100644
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index 4492028a07..8a5f5358cb 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index dcb4ba8d7b..b3f314050a 100644
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-bdb2/abandon.c b/servers/slapd/back-bdb2/abandon.c
index 8e3d70fecc..a062487393 100644
--- a/servers/slapd/back-bdb2/abandon.c
+++ b/servers/slapd/back-bdb2/abandon.c
@@ -1,4 +1,5 @@
 /* abandon.c - ldbm backend abandon routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/add.c b/servers/slapd/back-bdb2/add.c
index 3bca6e99c5..b72dc51512 100644
--- a/servers/slapd/back-bdb2/add.c
+++ b/servers/slapd/back-bdb2/add.c
@@ -1,4 +1,5 @@
 /* add.c - ldap bdb2 back-end add routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/alias.c b/servers/slapd/back-bdb2/alias.c
index 295840022e..3de54b9bf0 100644
--- a/servers/slapd/back-bdb2/alias.c
+++ b/servers/slapd/back-bdb2/alias.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-bdb2/attr.c b/servers/slapd/back-bdb2/attr.c
index f7563b2d48..7fa5988865 100644
--- a/servers/slapd/back-bdb2/attr.c
+++ b/servers/slapd/back-bdb2/attr.c
@@ -1,4 +1,5 @@
 /* attr.c - backend routines for dealing with attributes */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/back-bdb2.h b/servers/slapd/back-bdb2/back-bdb2.h
index 758318c080..4ebc54422c 100644
--- a/servers/slapd/back-bdb2/back-bdb2.h
+++ b/servers/slapd/back-bdb2/back-bdb2.h
@@ -1,4 +1,5 @@
 /* back-bdb2.h - ldap bdb2 back-end header file */
+/* $OpenLDAP$ */
 
 #ifndef _BACK_BDB2_H_
 #define _BACK_BDB2_H_
diff --git a/servers/slapd/back-bdb2/bind.c b/servers/slapd/back-bdb2/bind.c
index 5f2ae0d9a2..e022a5533b 100644
--- a/servers/slapd/back-bdb2/bind.c
+++ b/servers/slapd/back-bdb2/bind.c
@@ -1,4 +1,5 @@
 /* bind.c - bdb2 backend bind and unbind routines */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/cache.c b/servers/slapd/back-bdb2/cache.c
index cd71733bef..4c44dbcc46 100644
--- a/servers/slapd/back-bdb2/cache.c
+++ b/servers/slapd/back-bdb2/cache.c
@@ -1,4 +1,5 @@
 /* cache.c - routines to maintain an in-core cache of entries */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/close.c b/servers/slapd/back-bdb2/close.c
index 894e4dfadc..98d68c7c68 100644
--- a/servers/slapd/back-bdb2/close.c
+++ b/servers/slapd/back-bdb2/close.c
@@ -1,4 +1,5 @@
 /* close.c - close bdb2 backend database */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/compare.c b/servers/slapd/back-bdb2/compare.c
index f2fa1dd164..46093d61a6 100644
--- a/servers/slapd/back-bdb2/compare.c
+++ b/servers/slapd/back-bdb2/compare.c
@@ -1,4 +1,5 @@
 /* compare.c - bdb2 backend compare routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/config.c b/servers/slapd/back-bdb2/config.c
index a451a4a4d4..87d739204a 100644
--- a/servers/slapd/back-bdb2/config.c
+++ b/servers/slapd/back-bdb2/config.c
@@ -1,4 +1,5 @@
 /* config.c - bdb2 backend configuration file routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/dbcache.c b/servers/slapd/back-bdb2/dbcache.c
index 68ec349d37..6a1a0ef3d8 100644
--- a/servers/slapd/back-bdb2/dbcache.c
+++ b/servers/slapd/back-bdb2/dbcache.c
@@ -1,4 +1,5 @@
 /* ldbmcache.c - maintain a cache of open bdb2 files */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/delete.c b/servers/slapd/back-bdb2/delete.c
index 898c36b617..eee7b6d914 100644
--- a/servers/slapd/back-bdb2/delete.c
+++ b/servers/slapd/back-bdb2/delete.c
@@ -1,4 +1,5 @@
 /* delete.c - bdb2 backend delete routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/dn2id.c b/servers/slapd/back-bdb2/dn2id.c
index dbf2ab4412..1d4599a826 100644
--- a/servers/slapd/back-bdb2/dn2id.c
+++ b/servers/slapd/back-bdb2/dn2id.c
@@ -1,4 +1,5 @@
 /* dn2id.c - routines to deal with the dn2id index */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/entry.c b/servers/slapd/back-bdb2/entry.c
index 4d9f76d95e..9238b1c9b2 100644
--- a/servers/slapd/back-bdb2/entry.c
+++ b/servers/slapd/back-bdb2/entry.c
@@ -1,4 +1,5 @@
 /* entry.c - ldbm backend entry_release routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/external.h b/servers/slapd/back-bdb2/external.h
index 1aaed3d04d..9af5a84ed6 100644
--- a/servers/slapd/back-bdb2/external.h
+++ b/servers/slapd/back-bdb2/external.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _BDB2_EXTERNAL_H
 #define _BDB2_EXTERNAL_H
 
diff --git a/servers/slapd/back-bdb2/filterindex.c b/servers/slapd/back-bdb2/filterindex.c
index ad546caa48..a9f7452cf4 100644
--- a/servers/slapd/back-bdb2/filterindex.c
+++ b/servers/slapd/back-bdb2/filterindex.c
@@ -1,4 +1,5 @@
 /* filterindex.c - generate the list of candidate entries from a filter */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/group.c b/servers/slapd/back-bdb2/group.c
index 94967d756f..4bc4fc9a45 100644
--- a/servers/slapd/back-bdb2/group.c
+++ b/servers/slapd/back-bdb2/group.c
@@ -1,4 +1,5 @@
 /* group.c - bdb2 backend acl group routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/id2children.c b/servers/slapd/back-bdb2/id2children.c
index 903418daa6..8db5c188b3 100644
--- a/servers/slapd/back-bdb2/id2children.c
+++ b/servers/slapd/back-bdb2/id2children.c
@@ -1,4 +1,5 @@
 /* id2children.c - routines to deal with the id2children index */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/id2entry.c b/servers/slapd/back-bdb2/id2entry.c
index c7bf18e5c0..1a151fb1d6 100644
--- a/servers/slapd/back-bdb2/id2entry.c
+++ b/servers/slapd/back-bdb2/id2entry.c
@@ -1,4 +1,5 @@
 /* id2entry.c - routines to deal with the id2entry index */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/idl.c b/servers/slapd/back-bdb2/idl.c
index 299ee1cc74..c062642d8e 100644
--- a/servers/slapd/back-bdb2/idl.c
+++ b/servers/slapd/back-bdb2/idl.c
@@ -1,4 +1,5 @@
 /* idl.c - ldap id list handling routines */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/index.c b/servers/slapd/back-bdb2/index.c
index 0338712c70..6ef1ca2f73 100644
--- a/servers/slapd/back-bdb2/index.c
+++ b/servers/slapd/back-bdb2/index.c
@@ -1,4 +1,5 @@
 /* index.c - routines for dealing with attribute indexes */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/init.c b/servers/slapd/back-bdb2/init.c
index 3977fc5e20..0eb5080460 100644
--- a/servers/slapd/back-bdb2/init.c
+++ b/servers/slapd/back-bdb2/init.c
@@ -1,4 +1,5 @@
 /* init.c - initialize bdb2 backend */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/kerberos.c b/servers/slapd/back-bdb2/kerberos.c
index 26de882162..61a9db0763 100644
--- a/servers/slapd/back-bdb2/kerberos.c
+++ b/servers/slapd/back-bdb2/kerberos.c
@@ -1,4 +1,5 @@
 /* kerberos.c - bdb2 backend kerberos bind routines */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/modify.c b/servers/slapd/back-bdb2/modify.c
index 1e4a62d9a3..817d3ba26f 100644
--- a/servers/slapd/back-bdb2/modify.c
+++ b/servers/slapd/back-bdb2/modify.c
@@ -1,4 +1,5 @@
 /* modify.c - bdb2 backend modify routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/modrdn.c b/servers/slapd/back-bdb2/modrdn.c
index 756a0c1924..47c260fed7 100644
--- a/servers/slapd/back-bdb2/modrdn.c
+++ b/servers/slapd/back-bdb2/modrdn.c
@@ -1,4 +1,5 @@
 /* modrdn.c - bdb2 backend modrdn routine */
+/* $OpenLDAP$ */
 
 /*
  * LDAP v3 newSuperior support.
diff --git a/servers/slapd/back-bdb2/nextid.c b/servers/slapd/back-bdb2/nextid.c
index 91cb5e360a..c00c67d11d 100644
--- a/servers/slapd/back-bdb2/nextid.c
+++ b/servers/slapd/back-bdb2/nextid.c
@@ -1,4 +1,5 @@
 /* id.c - keep track of the next id to be given out */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/porter.c b/servers/slapd/back-bdb2/porter.c
index 8dba543e7c..55f87a63d3 100644
--- a/servers/slapd/back-bdb2/porter.c
+++ b/servers/slapd/back-bdb2/porter.c
@@ -1,4 +1,5 @@
 /* porter.c - port functions of the bdb2 backend */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/proto-back-bdb2.h b/servers/slapd/back-bdb2/proto-back-bdb2.h
index 4b7d6e8674..befba8b8ab 100644
--- a/servers/slapd/back-bdb2/proto-back-bdb2.h
+++ b/servers/slapd/back-bdb2/proto-back-bdb2.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _PROTO_BACK_BDB2
 #define _PROTO_BACK_BDB2
 
diff --git a/servers/slapd/back-bdb2/search.c b/servers/slapd/back-bdb2/search.c
index 9b5dc6d3de..4bec697151 100644
--- a/servers/slapd/back-bdb2/search.c
+++ b/servers/slapd/back-bdb2/search.c
@@ -1,4 +1,5 @@
 /* search.c - bdb2 backend search function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/startup.c b/servers/slapd/back-bdb2/startup.c
index 289a4fd298..3bf3b09d97 100644
--- a/servers/slapd/back-bdb2/startup.c
+++ b/servers/slapd/back-bdb2/startup.c
@@ -1,4 +1,5 @@
 /* startup.c - startup/shutdown bdb2 backend */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/timing.c b/servers/slapd/back-bdb2/timing.c
index f707e45276..c1d6605674 100644
--- a/servers/slapd/back-bdb2/timing.c
+++ b/servers/slapd/back-bdb2/timing.c
@@ -1,4 +1,5 @@
 /* timing.c - timing bdb2 backend */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/tools.c b/servers/slapd/back-bdb2/tools.c
index ba9c939ee4..662381dfb0 100644
--- a/servers/slapd/back-bdb2/tools.c
+++ b/servers/slapd/back-bdb2/tools.c
@@ -1,4 +1,5 @@
 /* tools.c - tools for slap tools */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-bdb2/txn.c b/servers/slapd/back-bdb2/txn.c
index 747a754cce..2a711385d1 100644
--- a/servers/slapd/back-bdb2/txn.c
+++ b/servers/slapd/back-bdb2/txn.c
@@ -1,4 +1,5 @@
 /* txn.c - TP support functions of the bdb2 backend */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-bdb2/txn.h b/servers/slapd/back-bdb2/txn.h
index 4ff604eb8e..9093127ae2 100644
--- a/servers/slapd/back-bdb2/txn.h
+++ b/servers/slapd/back-bdb2/txn.h
@@ -1,4 +1,5 @@
 /* txn.h - Header for TP support functions of the bdb2 backend */
+/* $OpenLDAP$ */
 
 #ifndef _BDB2_TXN_H_
 #define _BDB2_TXN_H_
diff --git a/servers/slapd/back-bdb2/unbind.c b/servers/slapd/back-bdb2/unbind.c
index 6b3a8757d3..b2c179dee9 100644
--- a/servers/slapd/back-bdb2/unbind.c
+++ b/servers/slapd/back-bdb2/unbind.c
@@ -1,4 +1,5 @@
 /* unbind.c - handle an ldap unbind operation */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-ldap/add.c b/servers/slapd/back-ldap/add.c
index b6f84fad6b..2ff2b7568c 100644
--- a/servers/slapd/back-ldap/add.c
+++ b/servers/slapd/back-ldap/add.c
@@ -1,4 +1,5 @@
 /* add.c - ldap backend add function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index 341070cb6c..f3063a8c0c 100644
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -1,4 +1,5 @@
 /* back-ldap.h - ldap backend header file */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index ad68aa7664..45f9df5c1e 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -1,4 +1,5 @@
 /* bind.c - ldap backend bind function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 26a1b8d58a..206437d432 100644
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -1,4 +1,5 @@
 /* compare.c - ldap backend compare function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 5927ff80fb..6326116f73 100644
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -1,4 +1,5 @@
 /* config.c - ldap backend configuration file routine */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c
index 6f4b744424..b5e00cc2bb 100644
--- a/servers/slapd/back-ldap/delete.c
+++ b/servers/slapd/back-ldap/delete.c
@@ -1,4 +1,5 @@
 /* delete.c - ldap backend delete function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/external.h b/servers/slapd/back-ldap/external.h
index 9ee32f96f3..58b5e77a07 100644
--- a/servers/slapd/back-ldap/external.h
+++ b/servers/slapd/back-ldap/external.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _LDAP_EXTERNAL_H
 #define _LDAP_EXTERNAL_H
 
diff --git a/servers/slapd/back-ldap/init.c b/servers/slapd/back-ldap/init.c
index ce0c020fa3..e1d80f76e6 100644
--- a/servers/slapd/back-ldap/init.c
+++ b/servers/slapd/back-ldap/init.c
@@ -1,4 +1,5 @@
 /* init.c - initialize ldap backend */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index b9ae551176..c1b7df0337 100644
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -1,4 +1,5 @@
 /* modify.c - ldap backend modify function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index d1d4d347cd..b2c4cecd3b 100644
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -1,4 +1,5 @@
 /* modrdn.c - ldap backend modrdn function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 31bab0f105..8eb4a31f0b 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -1,4 +1,5 @@
 /* search.c - ldap backend search function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldap/unbind.c b/servers/slapd/back-ldap/unbind.c
index 09075aa69d..ac1adcb740 100644
--- a/servers/slapd/back-ldap/unbind.c
+++ b/servers/slapd/back-ldap/unbind.c
@@ -1,4 +1,5 @@
 /* unbind.c - ldap backend unbind function */
+/* $OpenLDAP$ */
 
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
diff --git a/servers/slapd/back-ldbm/abandon.c b/servers/slapd/back-ldbm/abandon.c
index 4fe70427b5..27ace1a927 100644
--- a/servers/slapd/back-ldbm/abandon.c
+++ b/servers/slapd/back-ldbm/abandon.c
@@ -1,4 +1,5 @@
 /* abandon.c - ldbm backend abandon routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index 5f8f9052f5..edeaf57a10 100644
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -1,4 +1,5 @@
 /* add.c - ldap ldbm back-end add routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c
index ca3f393b11..ccc68804e3 100644
--- a/servers/slapd/back-ldbm/alias.c
+++ b/servers/slapd/back-ldbm/alias.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/attr.c b/servers/slapd/back-ldbm/attr.c
index be71dcf2f7..37a5cf94b3 100644
--- a/servers/slapd/back-ldbm/attr.c
+++ b/servers/slapd/back-ldbm/attr.c
@@ -1,4 +1,5 @@
 /* attr.c - backend routines for dealing with attributes */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/back-ldbm.h b/servers/slapd/back-ldbm/back-ldbm.h
index 9a68e0e2d1..cf381da96f 100644
--- a/servers/slapd/back-ldbm/back-ldbm.h
+++ b/servers/slapd/back-ldbm/back-ldbm.h
@@ -1,4 +1,5 @@
 /* back-ldbm.h - ldap ldbm back-end header file */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 6a2efc8f0c..1880a8a8cc 100644
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -1,4 +1,5 @@
 /* bind.c - ldbm backend bind and unbind routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c
index d23747d995..0ef36d7d34 100644
--- a/servers/slapd/back-ldbm/cache.c
+++ b/servers/slapd/back-ldbm/cache.c
@@ -1,4 +1,5 @@
 /* cache.c - routines to maintain an in-core cache of entries */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/close.c b/servers/slapd/back-ldbm/close.c
index 37a5235780..9aa2ca4169 100644
--- a/servers/slapd/back-ldbm/close.c
+++ b/servers/slapd/back-ldbm/close.c
@@ -1,4 +1,5 @@
 /* close.c - close ldbm backend */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/compare.c b/servers/slapd/back-ldbm/compare.c
index 278a806d6f..96932cecfc 100644
--- a/servers/slapd/back-ldbm/compare.c
+++ b/servers/slapd/back-ldbm/compare.c
@@ -1,4 +1,5 @@
 /* compare.c - ldbm backend compare routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/config.c b/servers/slapd/back-ldbm/config.c
index 57cbd36c3d..ef06a4fcc7 100644
--- a/servers/slapd/back-ldbm/config.c
+++ b/servers/slapd/back-ldbm/config.c
@@ -1,4 +1,5 @@
 /* config.c - ldbm backend configuration file routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/dbcache.c b/servers/slapd/back-ldbm/dbcache.c
index 0aa9090e9e..eecf2c954b 100644
--- a/servers/slapd/back-ldbm/dbcache.c
+++ b/servers/slapd/back-ldbm/dbcache.c
@@ -1,4 +1,5 @@
 /* ldbmcache.c - maintain a cache of open ldbm files */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index c02e22c845..eb3ed850e2 100644
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -1,4 +1,5 @@
 /* delete.c - ldbm backend delete routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 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 e1e8a1a311..afa1c27de6 100644
--- a/servers/slapd/back-ldbm/dn2id.c
+++ b/servers/slapd/back-ldbm/dn2id.c
@@ -1,4 +1,5 @@
 /* dn2id.c - routines to deal with the dn2id index */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/entry.c b/servers/slapd/back-ldbm/entry.c
index 503aab692a..7ff873b855 100644
--- a/servers/slapd/back-ldbm/entry.c
+++ b/servers/slapd/back-ldbm/entry.c
@@ -1,4 +1,5 @@
 /* entry.c - ldbm backend entry_release routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/external.h b/servers/slapd/back-ldbm/external.h
index 31fddcf0e5..e1b8696db6 100644
--- a/servers/slapd/back-ldbm/external.h
+++ b/servers/slapd/back-ldbm/external.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index 1db64e4480..81deb55a60 100644
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -1,4 +1,5 @@
 /* filterindex.c - generate the list of candidate entries from a filter */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
index fbbc7f21b6..8dbe75922a 100644
--- a/servers/slapd/back-ldbm/group.c
+++ b/servers/slapd/back-ldbm/group.c
@@ -1,4 +1,5 @@
 /* group.c - ldbm backend acl group routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/id2children.c b/servers/slapd/back-ldbm/id2children.c
index 00d5bf6988..acbab8fd77 100644
--- a/servers/slapd/back-ldbm/id2children.c
+++ b/servers/slapd/back-ldbm/id2children.c
@@ -1,4 +1,5 @@
 /* id2children.c - routines to deal with the id2children index */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/id2entry.c b/servers/slapd/back-ldbm/id2entry.c
index 982e816d6b..53f52d85a5 100644
--- a/servers/slapd/back-ldbm/id2entry.c
+++ b/servers/slapd/back-ldbm/id2entry.c
@@ -1,4 +1,5 @@
 /* id2entry.c - routines to deal with the id2entry index */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/idl.c b/servers/slapd/back-ldbm/idl.c
index 91499f04fa..f528fa8665 100644
--- a/servers/slapd/back-ldbm/idl.c
+++ b/servers/slapd/back-ldbm/idl.c
@@ -1,4 +1,5 @@
 /* idl.c - ldap id list handling routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index b44ffab756..12db542582 100644
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -1,4 +1,5 @@
 /* index.c - routines for dealing with attribute indexes */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index ab29410fb6..d7b6345e9f 100644
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -1,4 +1,5 @@
 /* init.c - initialize ldbm backend */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/kerberos.c b/servers/slapd/back-ldbm/kerberos.c
index c8e4a54a0a..7a80877240 100644
--- a/servers/slapd/back-ldbm/kerberos.c
+++ b/servers/slapd/back-ldbm/kerberos.c
@@ -1,4 +1,5 @@
 /* kerberos.c - ldbm backend kerberos bind routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c
index 267222b01c..770be8dbc2 100644
--- a/servers/slapd/back-ldbm/modify.c
+++ b/servers/slapd/back-ldbm/modify.c
@@ -1,4 +1,5 @@
 /* modify.c - ldbm backend modify routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index f01fea3d3a..08300fbf68 100644
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -1,4 +1,5 @@
 /* modrdn.c - ldbm backend modrdn routine */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/nextid.c b/servers/slapd/back-ldbm/nextid.c
index 0096190894..ebe6f38971 100644
--- a/servers/slapd/back-ldbm/nextid.c
+++ b/servers/slapd/back-ldbm/nextid.c
@@ -1,4 +1,5 @@
 /* nextid.c - keep track of the next id to be given out */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h
index 030a34d2f8..1b466f4eb6 100644
--- a/servers/slapd/back-ldbm/proto-back-ldbm.h
+++ b/servers/slapd/back-ldbm/proto-back-ldbm.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 26c3c9619f..2858e24961 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -1,4 +1,5 @@
 /* search.c - ldbm backend search function */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/startup.c b/servers/slapd/back-ldbm/startup.c
index ce2f87c18a..8137e0bd1b 100644
--- a/servers/slapd/back-ldbm/startup.c
+++ b/servers/slapd/back-ldbm/startup.c
@@ -1,4 +1,5 @@
 /* startup.c - startup ldbm backend */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/tools.c b/servers/slapd/back-ldbm/tools.c
index 188211f396..840449e473 100644
--- a/servers/slapd/back-ldbm/tools.c
+++ b/servers/slapd/back-ldbm/tools.c
@@ -1,4 +1,5 @@
 /* tools.c - tools for slap tools */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-ldbm/unbind.c b/servers/slapd/back-ldbm/unbind.c
index abf7fdf1c2..69538da67b 100644
--- a/servers/slapd/back-ldbm/unbind.c
+++ b/servers/slapd/back-ldbm/unbind.c
@@ -1,4 +1,5 @@
 /* unbind.c - handle an ldap unbind operation */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/back-passwd/config.c b/servers/slapd/back-passwd/config.c
index 04ef9f1b75..d976856089 100644
--- a/servers/slapd/back-passwd/config.c
+++ b/servers/slapd/back-passwd/config.c
@@ -1,4 +1,5 @@
 /* config.c - passwd backend configuration file routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-passwd/external.h b/servers/slapd/back-passwd/external.h
index 924e7a2ef8..92dd26e95d 100644
--- a/servers/slapd/back-passwd/external.h
+++ b/servers/slapd/back-passwd/external.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _PASSWD_EXTERNAL_H
 #define _PASSWD_EXTERNAL_H
 
diff --git a/servers/slapd/back-passwd/init.c b/servers/slapd/back-passwd/init.c
index ea500d7b3c..609231dba4 100644
--- a/servers/slapd/back-passwd/init.c
+++ b/servers/slapd/back-passwd/init.c
@@ -1,4 +1,5 @@
 /* init.c - initialize passwd backend */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-passwd/search.c b/servers/slapd/back-passwd/search.c
index e5da84a997..68af4b3fa4 100644
--- a/servers/slapd/back-passwd/search.c
+++ b/servers/slapd/back-passwd/search.c
@@ -1,4 +1,5 @@
 /* search.c - /etc/passwd backend search function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-perl/add.c b/servers/slapd/back-perl/add.c
index ed30475ac9..707b140f94 100644
--- a/servers/slapd/back-perl/add.c
+++ b/servers/slapd/back-perl/add.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/bind.c b/servers/slapd/back-perl/bind.c
index ad3419b56b..9d20afd783 100644
--- a/servers/slapd/back-perl/bind.c
+++ b/servers/slapd/back-perl/bind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/close.c b/servers/slapd/back-perl/close.c
index 61c8f03e5b..79b62afe2c 100644
--- a/servers/slapd/back-perl/close.c
+++ b/servers/slapd/back-perl/close.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/compare.c b/servers/slapd/back-perl/compare.c
index 482cdd06d5..4c9f3904ef 100644
--- a/servers/slapd/back-perl/compare.c
+++ b/servers/slapd/back-perl/compare.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/config.c b/servers/slapd/back-perl/config.c
index e10cb05bf6..f68a0a1282 100644
--- a/servers/slapd/back-perl/config.c
+++ b/servers/slapd/back-perl/config.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/delete.c b/servers/slapd/back-perl/delete.c
index 53acb19945..19d2346f9a 100644
--- a/servers/slapd/back-perl/delete.c
+++ b/servers/slapd/back-perl/delete.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/external.h b/servers/slapd/back-perl/external.h
index 4d0201220c..d41fb13ea5 100644
--- a/servers/slapd/back-perl/external.h
+++ b/servers/slapd/back-perl/external.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _PERL_EXTERNAL_H
 #define _PERL_EXTERNAL_H
 
diff --git a/servers/slapd/back-perl/init.c b/servers/slapd/back-perl/init.c
index c9f30913af..e215acd2e6 100644
--- a/servers/slapd/back-perl/init.c
+++ b/servers/slapd/back-perl/init.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/modify.c b/servers/slapd/back-perl/modify.c
index 025823e081..028b42e136 100644
--- a/servers/slapd/back-perl/modify.c
+++ b/servers/slapd/back-perl/modify.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/modrdn.c b/servers/slapd/back-perl/modrdn.c
index 5fa8bca123..d74701418f 100644
--- a/servers/slapd/back-perl/modrdn.c
+++ b/servers/slapd/back-perl/modrdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/perl_back.h b/servers/slapd/back-perl/perl_back.h
index 2f650a3c0a..6e53a7f25f 100644
--- a/servers/slapd/back-perl/perl_back.h
+++ b/servers/slapd/back-perl/perl_back.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef PERL_BACK_H
 #define PERL_BACK_H 1
 
diff --git a/servers/slapd/back-perl/search.c b/servers/slapd/back-perl/search.c
index f3dfe1565b..0feb28852d 100644
--- a/servers/slapd/back-perl/search.c
+++ b/servers/slapd/back-perl/search.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *	 Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-perl/unbind.c b/servers/slapd/back-perl/unbind.c
index 9d972195c6..a79f9062f8 100644
--- a/servers/slapd/back-perl/unbind.c
+++ b/servers/slapd/back-perl/unbind.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  *   Copyright 1999, John C. Quillan, All rights reserved.
  *
diff --git a/servers/slapd/back-shell/abandon.c b/servers/slapd/back-shell/abandon.c
index da497ab477..4f2932793e 100644
--- a/servers/slapd/back-shell/abandon.c
+++ b/servers/slapd/back-shell/abandon.c
@@ -1,4 +1,5 @@
 /* abandon.c - shell backend abandon function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/add.c b/servers/slapd/back-shell/add.c
index 1b6693f16a..293f3a8709 100644
--- a/servers/slapd/back-shell/add.c
+++ b/servers/slapd/back-shell/add.c
@@ -1,4 +1,5 @@
 /* add.c - shell backend add function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/bind.c b/servers/slapd/back-shell/bind.c
index 4454ffdd82..44bd6cd5e2 100644
--- a/servers/slapd/back-shell/bind.c
+++ b/servers/slapd/back-shell/bind.c
@@ -1,4 +1,5 @@
 /* bind.c - shell backend bind function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/compare.c b/servers/slapd/back-shell/compare.c
index 1788f21c1a..940f213fc5 100644
--- a/servers/slapd/back-shell/compare.c
+++ b/servers/slapd/back-shell/compare.c
@@ -1,4 +1,5 @@
 /* compare.c - shell backend compare function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/config.c b/servers/slapd/back-shell/config.c
index 2c79d6dcd5..03c7b7da76 100644
--- a/servers/slapd/back-shell/config.c
+++ b/servers/slapd/back-shell/config.c
@@ -1,4 +1,5 @@
 /* config.c - shell backend configuration file routine */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/delete.c b/servers/slapd/back-shell/delete.c
index 4a5b6cd2e3..27f67a2c63 100644
--- a/servers/slapd/back-shell/delete.c
+++ b/servers/slapd/back-shell/delete.c
@@ -1,4 +1,5 @@
 /* delete.c - shell backend delete function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/external.h b/servers/slapd/back-shell/external.h
index f2f523a11e..64c2dce5bc 100644
--- a/servers/slapd/back-shell/external.h
+++ b/servers/slapd/back-shell/external.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _SHELL_EXTERNAL_H
 #define _SHELL_EXTERNAL_H
 
diff --git a/servers/slapd/back-shell/fork.c b/servers/slapd/back-shell/fork.c
index 1f08097b1a..34adf8b5a3 100644
--- a/servers/slapd/back-shell/fork.c
+++ b/servers/slapd/back-shell/fork.c
@@ -1,4 +1,5 @@
 /* fork.c - fork and exec a process, connecting stdin/out w/pipes */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/init.c b/servers/slapd/back-shell/init.c
index 1b15c778c8..57c3742c4e 100644
--- a/servers/slapd/back-shell/init.c
+++ b/servers/slapd/back-shell/init.c
@@ -1,4 +1,5 @@
 /* init.c - initialize shell backend */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/modify.c b/servers/slapd/back-shell/modify.c
index 108f13d697..154bd2a6eb 100644
--- a/servers/slapd/back-shell/modify.c
+++ b/servers/slapd/back-shell/modify.c
@@ -1,4 +1,5 @@
 /* modify.c - shell backend modify function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/modrdn.c b/servers/slapd/back-shell/modrdn.c
index c11f3cb552..1df37d579c 100644
--- a/servers/slapd/back-shell/modrdn.c
+++ b/servers/slapd/back-shell/modrdn.c
@@ -1,4 +1,5 @@
 /* modrdn.c - shell backend modrdn function */
+/* $OpenLDAP$ */
 
 /*
  * LDAP v3 newSuperior support.
diff --git a/servers/slapd/back-shell/result.c b/servers/slapd/back-shell/result.c
index a10891c212..4d9f39c2f5 100644
--- a/servers/slapd/back-shell/result.c
+++ b/servers/slapd/back-shell/result.c
@@ -1,4 +1,5 @@
 /* result.c - shell backend result reading function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/search.c b/servers/slapd/back-shell/search.c
index ce1642a7ec..b2b6587719 100644
--- a/servers/slapd/back-shell/search.c
+++ b/servers/slapd/back-shell/search.c
@@ -1,4 +1,5 @@
 /* search.c - shell backend search function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-shell/shell.h b/servers/slapd/back-shell/shell.h
index 3853467dd5..573f485e8d 100644
--- a/servers/slapd/back-shell/shell.h
+++ b/servers/slapd/back-shell/shell.h
@@ -1,4 +1,5 @@
 /* shell.h - shell backend header file */
+/* $OpenLDAP$ */
 
 #ifndef SLAPD_SHELL_H
 #define SLAPD_SHELL_H
diff --git a/servers/slapd/back-shell/unbind.c b/servers/slapd/back-shell/unbind.c
index ca644a7acd..ca091da436 100644
--- a/servers/slapd/back-shell/unbind.c
+++ b/servers/slapd/back-shell/unbind.c
@@ -1,4 +1,5 @@
 /* unbind.c - shell backend unbind function */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/back-tcl/tcl_abandon.c b/servers/slapd/back-tcl/tcl_abandon.c
index 12bfb729db..5fcf8c5a28 100644
--- a/servers/slapd/back-tcl/tcl_abandon.c
+++ b/servers/slapd/back-tcl/tcl_abandon.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* abandon.c - tcl abandon routine
- *
- * $Id: tcl_abandon.c,v 1.4 1999/02/19 06:55:20 bcollins Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_add.c b/servers/slapd/back-tcl/tcl_add.c
index f91bbc5f8c..e2d324bba6 100644
--- a/servers/slapd/back-tcl/tcl_add.c
+++ b/servers/slapd/back-tcl/tcl_add.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* add.c - tcl add routine
- *
- * $Id: tcl_add.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_bind.c b/servers/slapd/back-tcl/tcl_bind.c
index 697b741fc8..a26da559f9 100644
--- a/servers/slapd/back-tcl/tcl_bind.c
+++ b/servers/slapd/back-tcl/tcl_bind.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* bind.c - tcl bind routines
- *
- * $Id: tcl_bind.c,v 1.7 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_close.c b/servers/slapd/back-tcl/tcl_close.c
index f01b9eefa6..4fb893a51e 100644
--- a/servers/slapd/back-tcl/tcl_close.c
+++ b/servers/slapd/back-tcl/tcl_close.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* close.c - tcl close routines
- *
- * $Id: tcl_close.c,v 1.3 1999/02/17 01:02:11 bcollins Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_compare.c b/servers/slapd/back-tcl/tcl_compare.c
index 3184b5fa58..06d23f54de 100644
--- a/servers/slapd/back-tcl/tcl_compare.c
+++ b/servers/slapd/back-tcl/tcl_compare.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* compare.c - tcl compare routines
- *
- * $Id: tcl_compare.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_config.c b/servers/slapd/back-tcl/tcl_config.c
index 96441907ad..64174bca83 100644
--- a/servers/slapd/back-tcl/tcl_config.c
+++ b/servers/slapd/back-tcl/tcl_config.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* config.c - tcl backend configuration file routine
- *
- * $Id: tcl_config.c,v 1.6 1999/02/23 02:51:33 bcollins Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_delete.c b/servers/slapd/back-tcl/tcl_delete.c
index d18234a0ea..53946ec63c 100644
--- a/servers/slapd/back-tcl/tcl_delete.c
+++ b/servers/slapd/back-tcl/tcl_delete.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* delete.c - tcl delete routines
- *
- * $Id: tcl_delete.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_init.c b/servers/slapd/back-tcl/tcl_init.c
index c7695b4e54..8acaa3c4dc 100644
--- a/servers/slapd/back-tcl/tcl_init.c
+++ b/servers/slapd/back-tcl/tcl_init.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* tcl_init.c - tcl backend initialization
- *
- * $Id: tcl_init.c,v 1.10 1999/08/06 11:16:27 hyc Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_modify.c b/servers/slapd/back-tcl/tcl_modify.c
index d82a4bbd25..e79bc943d8 100644
--- a/servers/slapd/back-tcl/tcl_modify.c
+++ b/servers/slapd/back-tcl/tcl_modify.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* modify.c - tcl modify routines
- *
- * $Id: tcl_modify.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_modrdn.c b/servers/slapd/back-tcl/tcl_modrdn.c
index 3e2c2f7e4f..d6aa9fbdf3 100644
--- a/servers/slapd/back-tcl/tcl_modrdn.c
+++ b/servers/slapd/back-tcl/tcl_modrdn.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* modrdn.c - tcl modify rdn routines
- *
- * $Id: tcl_modrdn.c,v 1.8 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_search.c b/servers/slapd/back-tcl/tcl_search.c
index 66d8663ed8..a26c4820f7 100644
--- a/servers/slapd/back-tcl/tcl_search.c
+++ b/servers/slapd/back-tcl/tcl_search.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* search.c - tcl search routines
- *
- * $Id: tcl_search.c,v 1.6 1999/07/16 00:45:52 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_unbind.c b/servers/slapd/back-tcl/tcl_unbind.c
index b75969cf75..a4f547751d 100644
--- a/servers/slapd/back-tcl/tcl_unbind.c
+++ b/servers/slapd/back-tcl/tcl_unbind.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* unbind.c - tcl unbind routines
- *
- * $Id: tcl_unbind.c,v 1.5.6.1 1999/07/09 18:02:59 kdz Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/back-tcl/tcl_util.c b/servers/slapd/back-tcl/tcl_util.c
index b1c64b5ac7..4e57669d31 100644
--- a/servers/slapd/back-tcl/tcl_util.c
+++ b/servers/slapd/back-tcl/tcl_util.c
@@ -1,6 +1,5 @@
+/* $OpenLDAP$ */
 /* result.c - tcl backend utility functions
- *
- * $Id: tcl_util.c,v 1.8 1999/08/02 23:38:43 hallvard Exp $
  *
  * Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.
  *
diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 0790b62164..39c3fdb8a9 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index f6800973a2..d42080d70f 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -1,4 +1,5 @@
 /* bind.c - decode an ldap bind operation and pass it to a backend db */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/ch_malloc.c b/servers/slapd/ch_malloc.c
index 5c57c7c021..72d63b69e2 100644
--- a/servers/slapd/ch_malloc.c
+++ b/servers/slapd/ch_malloc.c
@@ -1,4 +1,5 @@
 /* ch_malloc.c - malloc routines that test returns from malloc and friends */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/charray.c b/servers/slapd/charray.c
index bd79537de0..60c212e509 100644
--- a/servers/slapd/charray.c
+++ b/servers/slapd/charray.c
@@ -1,4 +1,5 @@
 /* charray.c - routines for dealing with char * arrays */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index e0625f20bc..1176265b41 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 61edb51e2a..493045cdf2 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -1,4 +1,5 @@
 /* config.c - configuration file handling routines */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/configinfo.c b/servers/slapd/configinfo.c
index 0b3acf089b..692b8575f2 100644
--- a/servers/slapd/configinfo.c
+++ b/servers/slapd/configinfo.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 93e8ee4d46..9c6e61d593 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index b60af869ae..03100eb05b 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /* 
  * Copyright 1999 The OpenLDAP Foundation.
  * All rights reserved.
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 4cbab7865e..b5e5531690 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 2378475971..292e1019e4 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 35fb84c5d5..d2a7daa8e8 100644
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -1,4 +1,5 @@
 /* dn.c - routines for dealing with distinguished names */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/entry.c b/servers/slapd/entry.c
index 849aece201..d530e52002 100644
--- a/servers/slapd/entry.c
+++ b/servers/slapd/entry.c
@@ -1,4 +1,5 @@
 /* entry.c - routines for dealing with entries */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c
index a9143e4ed8..fd9573cebd 100644
--- a/servers/slapd/extended.c
+++ b/servers/slapd/extended.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /* 
  * Copyright 1999 The OpenLDAP Foundation.
  * All rights reserved.
diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index cb830de014..35604cf6b9 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -1,4 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c
index a6baf16f1a..c1abb4555d 100644
--- a/servers/slapd/filterentry.c
+++ b/servers/slapd/filterentry.c
@@ -1,4 +1,5 @@
 /* filterentry.c - apply a filter to an entry */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index d46b90d3c7..f6e2cf9fc7 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,4 +1,5 @@
 /* init.c - initialize various things */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/lock.c b/servers/slapd/lock.c
index 97ac5f8968..e9f5fda164 100644
--- a/servers/slapd/lock.c
+++ b/servers/slapd/lock.c
@@ -1,4 +1,5 @@
 /* lock.c - routines to open and apply an advisory lock to a file */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 1c08e6bd41..a797cf621d 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index f1e1a52a43..c5556a33dc 100644
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index e341abf8ad..14d643545b 100644
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/module.c b/servers/slapd/module.c
index 3768f38b7c..7dd253a806 100644
--- a/servers/slapd/module.c
+++ b/servers/slapd/module.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 #include <stdio.h>
 #include "slap.h"
diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index 19f86a7b96..9ad7fbc080 100644
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/nt_svc.c b/servers/slapd/nt_svc.c
index 6981ab8359..3056262795 100644
--- a/servers/slapd/nt_svc.c
+++ b/servers/slapd/nt_svc.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 // nt_main.c
 #include "portable.h"
 #include <stdio.h>
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 01f9d12f5f..dff00fcf77 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,4 +1,5 @@
 /* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index f5e402f330..5d58ca0a35 100644
--- a/servers/slapd/phonetic.c
+++ b/servers/slapd/phonetic.c
@@ -1,4 +1,5 @@
 /* phonetic.c - routines to do phonetic matching */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 4be7e9310c..1e95a28052 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c
index 39e4e71218..7477e8406e 100644
--- a/servers/slapd/repl.c
+++ b/servers/slapd/repl.c
@@ -1,4 +1,5 @@
 /* repl.c - log modifications for replication purposes */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index f5038ac540..9e316669bc 100644
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -1,4 +1,5 @@
 /* result.c - routines to send ldap results, errors, and referrals */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 162891a913..919830f6de 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /* root_dse.c - Provides the ROOT DSA-Specific Entry
  *
  * Copyright 1999 The OpenLDAP Foundation.
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 8c348193ec..6eb8eea570 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index f3f3c509fe..0462243dab 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,4 +1,5 @@
 /* schema.c - routines to enforce schema definitions */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index f624b5dce8..14fef80d1d 100644
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -1,4 +1,5 @@
 /* schemaparse.c - routines to parse config file objectclass definitions */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 0ef53d14ff..32a797d249 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/shell-backends/passwd-shell.c b/servers/slapd/shell-backends/passwd-shell.c
index c62b5d058f..d7f7b191cf 100644
--- a/servers/slapd/shell-backends/passwd-shell.c
+++ b/servers/slapd/shell-backends/passwd-shell.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  passwd-shell.c - /etc/passwd shell-based backend for standalone ldap server
 
diff --git a/servers/slapd/shell-backends/passwd-shell.h b/servers/slapd/shell-backends/passwd-shell.h
index a90e021edc..227fd6041f 100644
--- a/servers/slapd/shell-backends/passwd-shell.h
+++ b/servers/slapd/shell-backends/passwd-shell.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  passwd-shell.h
 
diff --git a/servers/slapd/shell-backends/pwd-Version.c b/servers/slapd/shell-backends/pwd-Version.c
index 51d88f19d7..79a476659c 100644
--- a/servers/slapd/shell-backends/pwd-Version.c
+++ b/servers/slapd/shell-backends/pwd-Version.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/shell-backends/shellutil.c b/servers/slapd/shell-backends/shellutil.c
index 1bbf55abcd..d05ec73895 100644
--- a/servers/slapd/shell-backends/shellutil.c
+++ b/servers/slapd/shell-backends/shellutil.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  shellutil.c - common routines useful when building shell-based backends
 		 for the standalone ldap server
diff --git a/servers/slapd/shell-backends/shellutil.h b/servers/slapd/shell-backends/shellutil.h
index 451af0d3c8..28713094bb 100644
--- a/servers/slapd/shell-backends/shellutil.h
+++ b/servers/slapd/shell-backends/shellutil.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  shellutil.h
 
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index c1401d09fc..7cec633145 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1,4 +1,5 @@
 /* slap.h - stand alone ldap server include file */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index f3f2458668..cc98593519 100644
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -1,4 +1,5 @@
 /* str2filter.c - parse an rfc 1588 string filter */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/suffixalias.c b/servers/slapd/suffixalias.c
index 1b11005a5d..2e4120e8dd 100644
--- a/servers/slapd/suffixalias.c
+++ b/servers/slapd/suffixalias.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1999 The OpenLDAP Foundation, All Rights Reserved.
  *
diff --git a/servers/slapd/tools/centipede.c b/servers/slapd/tools/centipede.c
index 695119f291..732c8405dc 100644
--- a/servers/slapd/tools/centipede.c
+++ b/servers/slapd/tools/centipede.c
@@ -1,4 +1,5 @@
 /* centipede.c - generate and install indexing information (view w/tabstop=4) */
+/* $OpenLDAP$ */
 
 #include "portable.h"
 
diff --git a/servers/slapd/tools/chlog2replog.c b/servers/slapd/tools/chlog2replog.c
index ec31ed457f..2d77aa67d5 100644
--- a/servers/slapd/tools/chlog2replog.c
+++ b/servers/slapd/tools/chlog2replog.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1990, 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/tools/edb2ldif.c b/servers/slapd/tools/edb2ldif.c
index 8fe0ac64c9..0ef3fb8edc 100644
--- a/servers/slapd/tools/edb2ldif.c
+++ b/servers/slapd/tools/edb2ldif.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/tools/ldapsyntax.c b/servers/slapd/tools/ldapsyntax.c
index 5de70187f2..04bba0fd16 100644
--- a/servers/slapd/tools/ldapsyntax.c
+++ b/servers/slapd/tools/ldapsyntax.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/tools/ldapsyntax.h b/servers/slapd/tools/ldapsyntax.h
index 44a23263ca..f42934039c 100644
--- a/servers/slapd/tools/ldapsyntax.h
+++ b/servers/slapd/tools/ldapsyntax.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c
index 662bb57ad4..1897c0245b 100644
--- a/servers/slapd/tools/ldbmtest.c
+++ b/servers/slapd/tools/ldbmtest.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/tools/ldif.c b/servers/slapd/tools/ldif.c
index 5dd8acfa38..4618fc62aa 100644
--- a/servers/slapd/tools/ldif.c
+++ b/servers/slapd/tools/ldif.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/tools/mimic.c b/servers/slapd/tools/mimic.c
index cc9c8b8c9a..5aafbdbdae 100644
--- a/servers/slapd/tools/mimic.c
+++ b/servers/slapd/tools/mimic.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/tools/sizecount.c b/servers/slapd/tools/sizecount.c
index 6b363c19f7..8eca6bf1a6 100644
--- a/servers/slapd/tools/sizecount.c
+++ b/servers/slapd/tools/sizecount.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #include "portable.h"
 
 #include <stdio.h>
diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index 6245a30eb9..606a2f4aac 100644
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/tools/slapcat.c b/servers/slapd/tools/slapcat.c
index 80e698cba3..f210387816 100644
--- a/servers/slapd/tools/slapcat.c
+++ b/servers/slapd/tools/slapcat.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c
index 19fca63604..8b41f22323 100644
--- a/servers/slapd/tools/slapcommon.c
+++ b/servers/slapd/tools/slapcommon.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/tools/slapcommon.h b/servers/slapd/tools/slapcommon.h
index 1d92502943..d965bf754c 100644
--- a/servers/slapd/tools/slapcommon.h
+++ b/servers/slapd/tools/slapcommon.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/tools/slapindex.c b/servers/slapd/tools/slapindex.c
index 40207cf38a..ba63e70799 100644
--- a/servers/slapd/tools/slapindex.c
+++ b/servers/slapd/tools/slapindex.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/unbind.c b/servers/slapd/unbind.c
index 2e3437429b..14619b8f74 100644
--- a/servers/slapd/unbind.c
+++ b/servers/slapd/unbind.c
@@ -1,4 +1,5 @@
 /* unbind.c - decode an ldap unbind operation and pass it to a backend db */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/user.c b/servers/slapd/user.c
index ce2b0050e9..a309e0e80b 100644
--- a/servers/slapd/user.c
+++ b/servers/slapd/user.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slapd/value.c b/servers/slapd/value.c
index 5bed72da31..1405fd176e 100644
--- a/servers/slapd/value.c
+++ b/servers/slapd/value.c
@@ -1,4 +1,5 @@
 /* value.c - routines for dealing with values */
+/* $OpenLDAP$ */
 /*
  * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
diff --git a/servers/slurpd/admin.c b/servers/slurpd/admin.c
index 6f026d1090..d3017932e1 100644
--- a/servers/slurpd/admin.c
+++ b/servers/slurpd/admin.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index d6ebe5d772..81b45df4eb 100644
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/ch_malloc.c b/servers/slurpd/ch_malloc.c
index 41bad34005..1c6e29290b 100644
--- a/servers/slurpd/ch_malloc.c
+++ b/servers/slurpd/ch_malloc.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index 38802e4422..8a12eec1fa 100644
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/fm.c b/servers/slurpd/fm.c
index 752556e186..75c1afed02 100644
--- a/servers/slurpd/fm.c
+++ b/servers/slurpd/fm.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/globals.c b/servers/slurpd/globals.c
index 14e510a416..18f5a12fdb 100644
--- a/servers/slurpd/globals.c
+++ b/servers/slurpd/globals.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/globals.h b/servers/slurpd/globals.h
index 4e05074384..645cf0593a 100644
--- a/servers/slurpd/globals.h
+++ b/servers/slurpd/globals.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c
index ed431e3d48..a6873045da 100644
--- a/servers/slurpd/ldap_op.c
+++ b/servers/slurpd/ldap_op.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/lock.c b/servers/slurpd/lock.c
index 2a2ea20374..eb957c288b 100644
--- a/servers/slurpd/lock.c
+++ b/servers/slurpd/lock.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/main.c b/servers/slurpd/main.c
index 5e26628fcf..2aa86e75c9 100644
--- a/servers/slurpd/main.c
+++ b/servers/slurpd/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/proto-slurp.h b/servers/slurpd/proto-slurp.h
index 55a860099f..2d4adca306 100644
--- a/servers/slurpd/proto-slurp.h
+++ b/servers/slurpd/proto-slurp.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 #ifndef _PROTO_SLURP
 #define _PROTO_SLURP
 
diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c
index d95da212ed..df1780c49e 100644
--- a/servers/slurpd/re.c
+++ b/servers/slurpd/re.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/reject.c b/servers/slurpd/reject.c
index 643799268e..e5ce9a76b6 100644
--- a/servers/slurpd/reject.c
+++ b/servers/slurpd/reject.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/replica.c b/servers/slurpd/replica.c
index a75f22dfb3..50aca4e77e 100644
--- a/servers/slurpd/replica.c
+++ b/servers/slurpd/replica.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c
index 0e8f2f4c2e..f4c738061a 100644
--- a/servers/slurpd/replog.c
+++ b/servers/slurpd/replog.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index ff65b2c484..5335943ff5 100644
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/rq.c b/servers/slurpd/rq.c
index 1afd11db92..0dd599ba6d 100644
--- a/servers/slurpd/rq.c
+++ b/servers/slurpd/rq.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/sanity.c b/servers/slurpd/sanity.c
index d666f65da0..56886ff420 100644
--- a/servers/slurpd/sanity.c
+++ b/servers/slurpd/sanity.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 4573a71f24..19a6c9d58b 100644
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.
diff --git a/servers/slurpd/st.c b/servers/slurpd/st.c
index c92de4f78e..8a76b0b181 100644
--- a/servers/slurpd/st.c
+++ b/servers/slurpd/st.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * Copyright (c) 1996 Regents of the University of Michigan.
  * All rights reserved.