From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 9 Aug 1998 02:33:01 +0000 (+0000)
Subject: LDAPworld P3: SLAPD LDBM Generation with Multiple Backends
X-Git-Tag: LDAP_3_3+prerelease~27^2~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d5c2b41e69bd8802b4730f90a870a9302ba31f2;p=openldap

LDAPworld P3: SLAPD LDBM Generation with Multiple Backends
---

diff --git a/clients/fax500/Make-template b/clients/fax500/Make-template
index 7d20fb1366..997cc6513d 100644
--- a/clients/fax500/Make-template
+++ b/clients/fax500/Make-template
@@ -78,10 +78,10 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-rp500.o: rp500.c ../../include/ldapconfig.h ../../include/lber.h
-rp500.o: ../../include/ldap.h
-main.o: main.c ../../include/ldapconfig.h ../../include/portable.h
-main.o: ../../include/lber.h ../../include/ldap.h
+rp500.o: rp500.c ../../include/ldapconfig.h ../../include/proto-lber.h
+rp500.o: ../../include/proto-ldap.h
+main.o: main.c ../../include/portable.h ../../include/proto-lber.h
+main.o: ../../include/proto-ldap.h
 faxtotpc.o: faxtotpc.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/clients/finger/Make-template b/clients/finger/Make-template
index d55329f839..93d8b8dc39 100644
--- a/clients/finger/Make-template
+++ b/clients/finger/Make-template
@@ -63,8 +63,7 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/lber.h ../../include/ldap.h
-main.o: ../../include/disptmpl.h ../../include/portable.h
-main.o: ../../include/ldapconfig.h
+main.o: main.c ../../include/ldap.h ../../include/proto-ldap.h
+main.o: ../../include/portable.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/clients/gopher/Make-template b/clients/gopher/Make-template
index 9c45559d7a..18a907038a 100644
--- a/clients/gopher/Make-template
+++ b/clients/gopher/Make-template
@@ -80,12 +80,11 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-go500.o: go500.c ../../include/portable.h ../../include/ldapconfig.h
-go500.o: ../../include/lber.h ../../include/ldap.h ../../include/disptmpl.h
-go500gw.o: go500gw.c ../../include/lber.h ../../include/ldap.h
-go500gw.o: ../../include/disptmpl.h ../../include/portable.h
+go500.o: go500.c ../../include/ldapconfig.h ../../include/proto-lber.h
+go500.o: ../../include/proto-ldap.h
+go500gw.o: go500gw.c ../../include/ldap.h ../../include/proto-ldap.h
 go500gw.o: ../../include/ldapconfig.h
-detach.o: detach.c ../../include/portable.h
+detach.o: detach.c
 setproctitle.o: setproctitle.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/clients/mail500/Make-template b/clients/mail500/Make-template
index bdac2a2fc4..360eaa8b34 100644
--- a/clients/mail500/Make-template
+++ b/clients/mail500/Make-template
@@ -62,7 +62,7 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/portable.h ../../include/lber.h
-main.o: ../../include/ldap.h ../../include/ldapconfig.h
+main.o: main.c ../../include/portable.h ../../include/proto-lber.h
+main.o: ../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/clients/rcpt500/Make-template b/clients/rcpt500/Make-template
index 2677021a9e..7fc84bdfeb 100644
--- a/clients/rcpt500/Make-template
+++ b/clients/rcpt500/Make-template
@@ -61,11 +61,10 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/portable.h ../../include/ldapconfig.h rcpt500.h
-cmds.o: cmds.c rcpt500.h
-help.o: help.c ../../include/portable.h ../../include/ldapconfig.h rcpt500.h
-query.o: query.c ../../include/lber.h ../../include/ldap.h
-query.o: ../../include/portable.h ../../include/ldapconfig.h
-query.o: ../../include/disptmpl.h rcpt500.h
+main.o: main.c ../../include/portable.h
+cmds.o: cmds.c
+help.o: help.c ../../include/portable.h
+query.o: query.c ../../include/proto-lber.h ../../include/proto-ldap.h
+query.o: ../../include/ldapconfig.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/clients/tools/Make-template b/clients/tools/Make-template
index af3b4d5758..4c577dce3d 100644
--- a/clients/tools/Make-template
+++ b/clients/tools/Make-template
@@ -106,13 +106,13 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-ldapsearch.o: ldapsearch.c ../../include/lber.h ../../include/ldap.h
-ldapsearch.o: ../../include/ldif.h ../../include/ldapconfig.h
-ldapmodify.o: ldapmodify.c ../../include/lber.h ../../include/ldap.h
-ldapmodify.o: ../../include/ldif.h ../../include/ldapconfig.h
-ldapdelete.o: ldapdelete.c ../../include/lber.h ../../include/ldap.h
-ldapdelete.o: ../../include/ldapconfig.h
-ldapmodrdn.o: ldapmodrdn.c ../../include/lber.h ../../include/ldap.h
-ldapmodrdn.o: ../../include/ldapconfig.h
+ldapsearch.o: ldapsearch.c ../../include/lber.h ../../include/proto-ldap.h
+ldapsearch.o: ../../include/ldapconfig.h
+ldapmodify.o: ldapmodify.c ../../include/lber.h ../../include/proto-ldap.h
+ldapmodify.o: ../../include/ldapconfig.h
+ldapdelete.o: ldapdelete.c ../../include/proto-lber.h
+ldapdelete.o: ../../include/proto-ldap.h
+ldapmodrdn.o: ldapmodrdn.c ../../include/proto-lber.h
+ldapmodrdn.o: ../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/clients/ud/Make-template b/clients/ud/Make-template
index 1cba01cbd1..ed9d8faad8 100644
--- a/clients/ud/Make-template
+++ b/clients/ud/Make-template
@@ -80,21 +80,17 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/lber.h ../../include/ldap.h
-main.o: ../../include/ldapconfig.h ../../include/portable.h ud.h
-find.o: find.c ../../include/lber.h ../../include/ldap.h ud.h
-mod.o: mod.c ../../include/lber.h ../../include/ldap.h ud.h
-print.o: print.c ../../include/lber.h ../../include/ldap.h ud.h
-auth.o: auth.c ../../include/lber.h ../../include/ldap.h
-auth.o: ../../include/ldapconfig.h ud.h
-util.o: util.c ../../include/lber.h ../../include/ldap.h
-util.o: ../../include/ldapconfig.h ../../include/portable.h ud.h
-help.o: help.c ../../include/lber.h ../../include/ldap.h ud.h
+main.o: main.c ../../include/lber.h ../../include/proto-ldap.h
+main.o: ../../include/portable.h
+find.o: find.c ../../include/proto-lber.h ../../include/proto-ldap.h
+mod.o: mod.c ../../include/proto-lber.h ../../include/proto-ldap.h
+print.o: print.c ../../include/proto-lber.h ../../include/proto-ldap.h
+auth.o: auth.c ../../include/proto-lber.h ../../include/proto-ldap.h
+util.o: util.c ../../include/proto-lber.h ../../include/ldapconfig.h
+help.o: help.c ../../include/proto-lber.h ../../include/proto-ldap.h
 string_to_key.o: string_to_key.c
-group.o: group.c ../../include/lber.h ../../include/ldap.h
-group.o: ../../include/ldapconfig.h ud.h
-edit.o: edit.c ../../include/lber.h ../../include/ldap.h
-edit.o: ../../include/ldapconfig.h ud.h
-globals.o: globals.c ud.h
+group.o: group.c ../../include/lber.h ../../include/proto-ldap.h
+edit.o: edit.c ../../include/lber.h ../../include/proto-ldap.h
+globals.o: globals.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/libraries/liblber/Make-template b/libraries/liblber/Make-template
index f1b9dd4f36..6f29212711 100644
--- a/libraries/liblber/Make-template
+++ b/libraries/liblber/Make-template
@@ -77,9 +77,9 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-decode.o: decode.c ../../include/lber.h
+decode.o: decode.c ../../include/proto-lber.h
 encode.o: encode.c ../../include/lber.h
-io.o: io.c ../../include/lber.h
-bprint.o: bprint.c ../../include/lber.h
+io.o: io.c ../../include/proto-lber.h
+bprint.o: bprint.c ../../include/proto-lber.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/libraries/libldap/Make-template b/libraries/libldap/Make-template
index 9ca5d7f234..8d04b53b77 100644
--- a/libraries/libldap/Make-template
+++ b/libraries/libldap/Make-template
@@ -96,48 +96,43 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-bind.o: bind.c ../../include/lber.h ../../include/ldap.h
-open.o: open.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-result.o: result.c ../../include/portable.h ../../include/lber.h
-result.o: ../../include/ldap.h ldap-int.h
-error.o: error.c ../../include/lber.h ../../include/ldap.h
-compare.o: compare.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-search.o: search.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-modify.o: modify.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-add.o: add.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-modrdn.o: modrdn.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-delete.o: delete.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-abandon.o: abandon.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-ufn.o: ufn.c ../../include/lber.h ../../include/ldap.h
-cache.o: cache.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-getfilter.o: getfilter.c ../../include/lber.h ../../include/ldap.h
-getfilter.o: ../../include/regex.h
-regex.o: regex.c ../../include/portable.h
-sbind.o: sbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-kbind.o: kbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-unbind.o: unbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-friendly.o: friendly.c ../../include/lber.h ../../include/ldap.h
-cldap.o: cldap.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-free.o: free.c ../../include/lber.h ../../include/ldap.h
-disptmpl.o: disptmpl.c ../../include/lber.h ../../include/ldap.h
-disptmpl.o: ../../include/disptmpl.h
-srchpref.o: srchpref.c ../../include/lber.h ../../include/ldap.h
-srchpref.o: ../../include/srchpref.h
-dsparse.o: dsparse.c ../../include/lber.h ../../include/ldap.h
-tmplout.o: tmplout.c ../../include/lber.h ../../include/ldap.h
-tmplout.o: ../../include/disptmpl.h
-sort.o: sort.c ../../include/lber.h ../../include/ldap.h
-getdn.o: getdn.c ../../include/lber.h ../../include/ldap.h
-getentry.o: getentry.c ../../include/lber.h ../../include/ldap.h
-getattr.o: getattr.c ../../include/lber.h ../../include/ldap.h ldap-int.h
-getvalues.o: getvalues.c ../../include/lber.h ../../include/ldap.h
-addentry.o: addentry.c ../../include/lber.h ../../include/ldap.h
-request.o: request.c ../../include/portable.h ../../include/lber.h
-request.o: ../../include/ldap.h ldap-int.h
+bind.o: bind.c ../../include/lber.h ../../include/proto-ldap.h
+open.o: open.c ../../include/proto-lber.h ../../include/proto-ldap.h
+result.o: result.c ../../include/portable.h ../../include/proto-lber.h
+result.o: ../../include/proto-ldap.h
+error.o: error.c ../../include/lber.h ../../include/proto-ldap.h
+compare.o: compare.c ../../include/lber.h ../../include/proto-ldap.h
+search.o: search.c ../../include/lber.h ../../include/proto-ldap.h
+modify.o: modify.c ../../include/lber.h ../../include/proto-ldap.h
+add.o: add.c ../../include/lber.h ../../include/proto-ldap.h
+modrdn.o: modrdn.c ../../include/lber.h ../../include/proto-ldap.h
+delete.o: delete.c ../../include/lber.h ../../include/proto-ldap.h
+abandon.o: abandon.c ../../include/lber.h ../../include/proto-ldap.h
+ufn.o: ufn.c ../../include/lber.h ../../include/proto-ldap.h
+cache.o: cache.c ../../include/lber.h ../../include/proto-ldap.h
+getfilter.o: getfilter.c ../../include/lber.h ../../include/proto-ldap.h
+regex.o: regex.c
+sbind.o: sbind.c ../../include/lber.h ../../include/proto-ldap.h
+kbind.o: kbind.c
+unbind.o: unbind.c ../../include/proto-lber.h ../../include/proto-ldap.h
+friendly.o: friendly.c ../../include/lber.h ../../include/proto-ldap.h
+cldap.o: cldap.c
+free.o: free.c ../../include/ldap.h
+disptmpl.o: disptmpl.c ../../include/proto-lber.h ../../include/disptmpl.h
+srchpref.o: srchpref.c ../../include/proto-lber.h ../../include/srchpref.h
+dsparse.o: dsparse.c ../../include/proto-lber.h
+tmplout.o: tmplout.c ../../include/proto-lber.h ../../include/proto-ldap.h
+sort.o: sort.c ../../include/proto-lber.h ../../include/proto-ldap.h
+getdn.o: getdn.c ../../include/lber.h ../../include/proto-ldap.h
+getentry.o: getentry.c ../../include/lber.h ../../include/proto-ldap.h
+getattr.o: getattr.c ../../include/lber.h ../../include/proto-ldap.h
+getvalues.o: getvalues.c ../../include/lber.h ../../include/proto-ldap.h
+addentry.o: addentry.c ../../include/lber.h ../../include/proto-ldap.h
+request.o: request.c ../../include/portable.h ../../include/proto-lber.h
+request.o: ../../include/proto-ldap.h
 getdxbyname.o: getdxbyname.c
-os-ip.o: os-ip.c ../../include/portable.h ../../include/lber.h
-os-ip.o: ../../include/ldap.h
-url.o: url.c ../../include/lber.h ../../include/ldap.h ldap-int.h
+os-ip.o: os-ip.c ../../include/proto-lber.h ../../include/proto-ldap.h
+url.o: url.c ../../include/lber.h ../../include/proto-ldap.h
 charset.o: charset.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/libraries/libldbm/Make-template b/libraries/libldbm/Make-template
index 09ad2ee08f..ac7df08700 100644
--- a/libraries/libldbm/Make-template
+++ b/libraries/libldbm/Make-template
@@ -66,6 +66,6 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-ldbm.o: ldbm.c ../../include/ldbm.h
+ldbm.o: ldbm.c
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/libraries/libldif/Make-template b/libraries/libldif/Make-template
index 75061f7e5d..319cc51cb5 100644
--- a/libraries/libldif/Make-template
+++ b/libraries/libldif/Make-template
@@ -63,7 +63,6 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-line64.o: line64.c ../../include/lber.h ../../include/ldap.h
-line64.o: ../../include/ldif.h
+line64.o: line64.c ../../include/proto-lber.h ../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/libraries/liblthread/Make-template b/libraries/liblthread/Make-template
index 2344ba925c..c0721b1890 100644
--- a/libraries/liblthread/Make-template
+++ b/libraries/liblthread/Make-template
@@ -63,7 +63,7 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-thread.o: thread.c ../../include/lthread.h
-stack.o: stack.c ../../include/lber.h ../../include/ldap.h
+thread.o: thread.c
+stack.o: stack.c ../../include/proto-lber.h ../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template
index d3a5f49884..bdeb881c70 100644
--- a/servers/slapd/Make-template
+++ b/servers/slapd/Make-template
@@ -168,99 +168,79 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-main.o: main.c ../../include/portable.h slap.h ../../include/avl.h
-main.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-main.o: ../../include/ldif.h ../../include/ldapconfig.h
-daemon.o: daemon.c slap.h ../../include/avl.h ../../include/lber.h
-daemon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-daemon.o: ../../include/portable.h ../../include/ldapconfig.h
-connection.o: connection.c ../../include/portable.h slap.h ../../include/avl.h
-connection.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-connection.o: ../../include/ldif.h
-search.o: search.c slap.h ../../include/avl.h ../../include/lber.h
-search.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-search.o: ../../include/ldapconfig.h
-filter.o: filter.c slap.h ../../include/avl.h ../../include/lber.h
-filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-add.o: add.c slap.h ../../include/avl.h ../../include/lber.h
-add.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-charray.o: charray.c slap.h ../../include/avl.h ../../include/lber.h
-charray.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-attr.o: attr.c ../../include/portable.h slap.h ../../include/avl.h
-attr.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
+main.o: main.c ../../include/portable.h ../../include/avl.h
+main.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldapconfig.h
+daemon.o: daemon.c ../../include/avl.h ../../include/ldap.h
+daemon.o: ../../include/lthread.h ../../include/portable.h
+connection.o: connection.c ../../include/portable.h ../../include/avl.h
+connection.o: ../../include/ldap.h ../../include/lthread.h
+search.o: search.c ../../include/proto-lber.h ../../include/proto-ldap.h
+search.o: ../../include/ldif.h
+filter.o: filter.c ../../include/proto-lber.h ../../include/proto-ldap.h
+filter.o: ../../include/ldif.h
+add.o: add.c ../../include/avl.h ../../include/ldap.h
+add.o: ../../include/proto-ldap.h ../../include/ldif.h
+charray.o: charray.c ../../include/proto-lber.h ../../include/proto-ldap.h
+charray.o: ../../include/ldif.h
+attr.o: attr.c ../../include/proto-lber.h ../../include/proto-ldap.h
 attr.o: ../../include/ldif.h
-entry.o: entry.c slap.h ../../include/avl.h ../../include/lber.h
-entry.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-config.o: config.c slap.h ../../include/avl.h ../../include/lber.h
-config.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-config.o: ../../include/ldapconfig.h
-backend.o: backend.c slap.h ../../include/avl.h ../../include/lber.h
-backend.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-result.o: result.c ../../include/portable.h slap.h ../../include/avl.h
-result.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-result.o: ../../include/ldif.h
-operation.o: operation.c slap.h ../../include/avl.h ../../include/lber.h
-operation.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-dn.o: dn.c ../../include/portable.h slap.h ../../include/avl.h
-dn.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-dn.o: ../../include/ldif.h
-compare.o: compare.c slap.h ../../include/avl.h ../../include/lber.h
-compare.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-modify.o: modify.c slap.h ../../include/avl.h ../../include/lber.h
-modify.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-delete.o: delete.c slap.h ../../include/avl.h ../../include/lber.h
-delete.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-modrdn.o: modrdn.c slap.h ../../include/avl.h ../../include/lber.h
-modrdn.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-ch_malloc.o: ch_malloc.c slap.h ../../include/avl.h ../../include/lber.h
-ch_malloc.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-value.o: value.c ../../include/portable.h slap.h ../../include/avl.h
-value.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-value.o: ../../include/ldif.h
-ava.o: ava.c slap.h ../../include/avl.h ../../include/lber.h
-ava.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-bind.o: bind.c slap.h ../../include/avl.h ../../include/lber.h
-bind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-unbind.o: unbind.c slap.h ../../include/avl.h ../../include/lber.h
-unbind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-abandon.o: abandon.c slap.h ../../include/avl.h ../../include/lber.h
-abandon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-filterentry.o: filterentry.c ../../include/regex.h slap.h ../../include/avl.h
-filterentry.o: ../../include/lber.h ../../include/ldap.h
-filterentry.o: ../../include/lthread.h ../../include/ldif.h
-phonetic.o: phonetic.c ../../include/portable.h slap.h ../../include/avl.h
-phonetic.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-phonetic.o: ../../include/ldif.h
-regex.o: regex.c ../../include/portable.h
-acl.o: acl.c ../../include/regex.h slap.h ../../include/avl.h
-acl.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
+entry.o: entry.c ../../include/avl.h ../../include/ldap.h
+entry.o: ../../include/lthread.h
+config.o: config.c ../../include/proto-lber.h ../../include/proto-ldap.h
+config.o: ../../include/ldif.h
+backend.o: backend.c ../../include/avl.h ../../include/ldap.h
+backend.o: ../../include/lthread.h
+result.o: result.c ../../include/portable.h ../../include/avl.h
+result.o: ../../include/ldap.h ../../include/lthread.h
+operation.o: operation.c ../../include/proto-lber.h ../../include/proto-ldap.h
+operation.o: ../../include/ldif.h
+dn.o: dn.c ../../include/portable.h ../../include/avl.h ../../include/ldap.h
+dn.o: ../../include/lthread.h
+compare.o: compare.c ../../include/avl.h ../../include/ldap.h
+compare.o: ../../include/lthread.h
+modify.o: modify.c ../../include/avl.h ../../include/ldap.h
+modify.o: ../../include/proto-ldap.h ../../include/ldif.h
+delete.o: delete.c ../../include/proto-lber.h ../../include/proto-ldap.h
+delete.o: ../../include/ldif.h
+modrdn.o: modrdn.c ../../include/proto-lber.h ../../include/proto-ldap.h
+modrdn.o: ../../include/ldif.h
+ch_malloc.o: ch_malloc.c ../../include/avl.h ../../include/ldap.h
+ch_malloc.o: ../../include/lthread.h
+value.o: value.c ../../include/portable.h ../../include/avl.h
+value.o: ../../include/ldap.h ../../include/lthread.h
+ava.o: ava.c ../../include/proto-lber.h ../../include/proto-ldap.h
+ava.o: ../../include/ldif.h
+bind.o: bind.c ../../include/proto-lber.h ../../include/proto-ldap.h
+bind.o: ../../include/ldif.h
+unbind.o: unbind.c ../../include/avl.h ../../include/ldap.h
+unbind.o: ../../include/lthread.h
+abandon.o: abandon.c ../../include/avl.h ../../include/ldap.h
+abandon.o: ../../include/lthread.h
+filterentry.o: filterentry.c ../../include/proto-lber.h
+filterentry.o: ../../include/proto-ldap.h ../../include/ldif.h
+phonetic.o: phonetic.c ../../include/portable.h ../../include/avl.h
+phonetic.o: ../../include/ldap.h ../../include/lthread.h
+regex.o: regex.c
+acl.o: acl.c slap.h ../../include/proto-lber.h ../../include/proto-ldap.h
 acl.o: ../../include/ldif.h
-str2filter.o: str2filter.c slap.h ../../include/avl.h ../../include/lber.h
-str2filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-aclparse.o: aclparse.c ../../include/regex.h slap.h ../../include/avl.h
-aclparse.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-aclparse.o: ../../include/ldif.h ../../include/portable.h
-init.o: init.c ../../include/portable.h slap.h ../../include/avl.h
-init.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-init.o: ../../include/ldif.h
-detach.o: detach.c ../../include/portable.h
+str2filter.o: str2filter.c ../../include/avl.h ../../include/ldap.h
+str2filter.o: ../../include/lthread.h
+aclparse.o: aclparse.c slap.h ../../include/proto-lber.h
+aclparse.o: ../../include/proto-ldap.h ../../include/ldif.h
+init.o: init.c ../../include/portable.h ../../include/avl.h
+init.o: ../../include/ldap.h ../../include/lthread.h
+detach.o: detach.c
 strdup.o: strdup.c
 tempnam.o: tempnam.c
-repl.o: repl.c slap.h ../../include/avl.h ../../include/lber.h
-repl.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-lock.o: lock.c ../../include/portable.h slap.h ../../include/avl.h
-lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-lock.o: ../../include/ldif.h
-schema.o: schema.c slap.h ../../include/avl.h ../../include/lber.h
-schema.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-schemaparse.o: schemaparse.c slap.h ../../include/avl.h ../../include/lber.h
-schemaparse.o: ../../include/ldap.h ../../include/lthread.h
-schemaparse.o: ../../include/ldif.h
-monitor.o: monitor.c slap.h ../../include/avl.h ../../include/lber.h
-monitor.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-monitor.o: ../../include/ldapconfig.h
-configinfo.o: configinfo.c slap.h ../../include/avl.h ../../include/lber.h
-configinfo.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h
-configinfo.o: ../../include/ldapconfig.h
+repl.o: repl.c ../../include/proto-lber.h ../../include/lthread.h
+lock.o: lock.c ../../include/avl.h ../../include/ldap.h ../../include/lthread.h
+schema.o: schema.c ../../include/proto-lber.h ../../include/proto-ldap.h
+schema.o: ../../include/ldif.h
+schemaparse.o: schemaparse.c ../../include/avl.h ../../include/ldap.h
+schemaparse.o: ../../include/lthread.h
+monitor.o: monitor.c ../../include/avl.h ../../include/ldap.h
+monitor.o: ../../include/proto-ldap.h ../../include/ldif.h
+configinfo.o: configinfo.c ../../include/avl.h ../../include/ldap.h
+configinfo.o: ../../include/lthread.h ../../include/ldapconfig.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/servers/slapd/back-ldbm/Make-template b/servers/slapd/back-ldbm/Make-template
index a4b909ded0..f2fe468b1e 100644
--- a/servers/slapd/back-ldbm/Make-template
+++ b/servers/slapd/back-ldbm/Make-template
@@ -72,77 +72,59 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-idl.o: idl.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-idl.o: ../../../include/ldap.h ../../../include/lthread.h
-idl.o: ../../../include/ldif.h ../../../include/ldapconfig.h back-ldbm.h
-idl.o: ../../../include/ldbm.h
-add.o: add.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-add.o: ../../../include/ldap.h ../../../include/lthread.h
-add.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-search.o: search.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-search.o: ../../../include/ldap.h ../../../include/lthread.h
-search.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-cache.o: cache.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-cache.o: ../../../include/ldap.h ../../../include/lthread.h
-cache.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-dbcache.o: dbcache.c ../../../include/portable.h ../slap.h
-dbcache.o: ../../../include/avl.h ../../../include/lber.h
-dbcache.o: ../../../include/ldap.h ../../../include/lthread.h
-dbcache.o: ../../../include/ldif.h ../../../include/ldapconfig.h back-ldbm.h
-dbcache.o: ../../../include/ldbm.h
-dn2id.o: dn2id.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-dn2id.o: ../../../include/ldap.h ../../../include/lthread.h
-dn2id.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-id2entry.o: id2entry.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-id2entry.o: ../../../include/ldap.h ../../../include/lthread.h
-id2entry.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-index.o: index.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-index.o: ../../../include/ldap.h ../../../include/lthread.h
-index.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-id2children.o: id2children.c ../slap.h ../../../include/avl.h
-id2children.o: ../../../include/lber.h ../../../include/ldap.h
-id2children.o: ../../../include/lthread.h ../../../include/ldif.h back-ldbm.h
+idl.o: idl.c ../../../include/avl.h ../../../include/proto-lber.h
+idl.o: ../../../include/proto-ldap.h ../../../include/ldif.h back-ldbm.h
+add.o: add.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+add.o: ../../../include/ldif.h ../../../include/ldbm.h
+search.o: search.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+search.o: ../../../include/ldif.h ../../../include/ldbm.h
+cache.o: cache.c ../../../include/avl.h ../../../include/proto-lber.h
+cache.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+cache.o: ../../../include/ldbm.h
+dbcache.o: dbcache.c ../../../include/portable.h ../../../include/avl.h
+dbcache.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+dbcache.o: ../../../include/ldif.h back-ldbm.h
+dn2id.o: dn2id.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+dn2id.o: ../../../include/ldif.h ../../../include/ldbm.h
+id2entry.o: id2entry.c ../../../include/avl.h ../../../include/proto-lber.h
+id2entry.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+id2entry.o: ../../../include/ldbm.h
+index.o: index.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+index.o: ../../../include/ldif.h ../../../include/ldbm.h
+id2children.o: id2children.c ../../../include/proto-lber.h
+id2children.o: ../../../include/proto-ldap.h ../../../include/ldif.h
 id2children.o: ../../../include/ldbm.h
-nextid.o: nextid.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-nextid.o: ../../../include/ldap.h ../../../include/lthread.h
-nextid.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
+nextid.o: nextid.c ../../../include/avl.h ../../../include/proto-lber.h
+nextid.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+nextid.o: ../../../include/ldbm.h
 abandon.o: abandon.c
-compare.o: compare.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-compare.o: ../../../include/ldap.h ../../../include/lthread.h
-compare.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-modify.o: modify.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modify.o: ../../../include/ldap.h ../../../include/lthread.h
-modify.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-modrdn.o: modrdn.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modrdn.o: ../../../include/ldap.h ../../../include/lthread.h
-modrdn.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-delete.o: delete.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-delete.o: ../../../include/ldap.h ../../../include/lthread.h
-delete.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-init.o: init.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-init.o: ../../../include/ldap.h ../../../include/lthread.h
-init.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-config.o: config.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-config.o: ../../../include/ldap.h ../../../include/lthread.h
-config.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-bind.o: bind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-bind.o: ../../../include/ldap.h ../../../include/lthread.h
-bind.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-attr.o: attr.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-attr.o: ../../../include/ldap.h ../../../include/lthread.h
-attr.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-filterindex.o: filterindex.c ../slap.h ../../../include/avl.h
-filterindex.o: ../../../include/lber.h ../../../include/ldap.h
-filterindex.o: ../../../include/lthread.h ../../../include/ldif.h back-ldbm.h
-filterindex.o: ../../../include/ldbm.h
-unbind.o: unbind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-unbind.o: ../../../include/ldap.h ../../../include/lthread.h
-unbind.o: ../../../include/ldif.h
-kerberos.o: kerberos.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-kerberos.o: ../../../include/ldap.h ../../../include/lthread.h
-kerberos.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
-close.o: close.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-close.o: ../../../include/ldap.h ../../../include/lthread.h
-close.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h
+compare.o: compare.c ../../../include/proto-lber.h
+compare.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+compare.o: ../../../include/ldbm.h
+modify.o: modify.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modify.o: ../../../include/ldif.h ../../../include/ldbm.h
+modrdn.o: modrdn.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modrdn.o: ../../../include/ldif.h ../../../include/ldbm.h
+delete.o: delete.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+delete.o: ../../../include/ldif.h ../../../include/ldbm.h
+init.o: init.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+init.o: ../../../include/ldif.h ../../../include/ldbm.h
+config.o: config.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+config.o: ../../../include/ldif.h ../../../include/ldbm.h
+bind.o: bind.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+bind.o: ../../../include/ldif.h ../../../include/ldbm.h
+attr.o: attr.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+attr.o: ../../../include/ldif.h ../../../include/ldbm.h
+filterindex.o: filterindex.c ../../../include/avl.h
+filterindex.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+filterindex.o: ../../../include/ldif.h ../../../include/ldbm.h
+unbind.o: unbind.c ../../../include/avl.h ../../../include/proto-lber.h
+unbind.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+kerberos.o: kerberos.c ../../../include/proto-lber.h
+kerberos.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+kerberos.o: ../../../include/ldbm.h
+close.o: close.c ../../../include/avl.h ../../../include/proto-lber.h
+close.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+close.o: ../../../include/ldbm.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/servers/slapd/back-passwd/Make-template b/servers/slapd/back-passwd/Make-template
index 39ea8c292e..6283b10fe9 100644
--- a/servers/slapd/back-passwd/Make-template
+++ b/servers/slapd/back-passwd/Make-template
@@ -68,11 +68,10 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-search.o: search.c ../../../include/portable.h ../slap.h ../../../include/avl.h
-search.o: ../../../include/lber.h ../../../include/ldap.h
-search.o: ../../../include/lthread.h ../../../include/ldif.h
-config.o: config.c ../../../include/portable.h ../slap.h ../../../include/avl.h
-config.o: ../../../include/lber.h ../../../include/ldap.h
-config.o: ../../../include/lthread.h ../../../include/ldif.h
+search.o: search.c ../../../include/portable.h ../../../include/avl.h
+search.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+search.o: ../../../include/ldif.h
+config.o: config.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+config.o: ../../../include/ldif.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/servers/slapd/back-shell/Make-template b/servers/slapd/back-shell/Make-template
index 1eb631b57e..b72d05efe0 100644
--- a/servers/slapd/back-shell/Make-template
+++ b/servers/slapd/back-shell/Make-template
@@ -70,44 +70,31 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-init.o: init.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-init.o: ../../../include/ldap.h ../../../include/lthread.h
-init.o: ../../../include/ldif.h shell.h
-config.o: config.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-config.o: ../../../include/ldap.h ../../../include/lthread.h
-config.o: ../../../include/ldif.h shell.h
-fork.o: fork.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-fork.o: ../../../include/ldap.h ../../../include/lthread.h
+init.o: init.c ../../../include/avl.h ../../../include/proto-lber.h
+init.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+config.o: config.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+config.o: ../../../include/ldif.h
+fork.o: fork.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
 fork.o: ../../../include/ldif.h
-search.o: search.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-search.o: ../../../include/ldap.h ../../../include/lthread.h
-search.o: ../../../include/ldif.h shell.h
-bind.o: bind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-bind.o: ../../../include/ldap.h ../../../include/lthread.h
-bind.o: ../../../include/ldif.h shell.h
-unbind.o: unbind.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-unbind.o: ../../../include/ldap.h ../../../include/lthread.h
-unbind.o: ../../../include/ldif.h shell.h
-add.o: add.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-add.o: ../../../include/ldap.h ../../../include/lthread.h
-add.o: ../../../include/ldif.h shell.h
-delete.o: delete.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-delete.o: ../../../include/ldap.h ../../../include/lthread.h
-delete.o: ../../../include/ldif.h shell.h
-modify.o: modify.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modify.o: ../../../include/ldap.h ../../../include/lthread.h
-modify.o: ../../../include/ldif.h shell.h
-modrdn.o: modrdn.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-modrdn.o: ../../../include/ldap.h ../../../include/lthread.h
-modrdn.o: ../../../include/ldif.h shell.h
-compare.o: compare.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-compare.o: ../../../include/ldap.h ../../../include/lthread.h
-compare.o: ../../../include/ldif.h shell.h
-abandon.o: abandon.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-abandon.o: ../../../include/ldap.h ../../../include/lthread.h
-abandon.o: ../../../include/ldif.h shell.h
-result.o: result.c ../slap.h ../../../include/avl.h ../../../include/lber.h
-result.o: ../../../include/ldap.h ../../../include/lthread.h
-result.o: ../../../include/ldif.h shell.h
+search.o: search.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+search.o: ../../../include/ldif.h
+bind.o: bind.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+bind.o: ../../../include/ldif.h
+unbind.o: unbind.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+unbind.o: ../../../include/ldif.h
+add.o: add.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+add.o: ../../../include/ldif.h
+delete.o: delete.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+delete.o: ../../../include/ldif.h
+modify.o: modify.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modify.o: ../../../include/ldif.h
+modrdn.o: modrdn.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+modrdn.o: ../../../include/ldif.h
+compare.o: compare.c ../../../include/proto-lber.h
+compare.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+abandon.o: abandon.c ../../../include/avl.h ../../../include/proto-lber.h
+abandon.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+result.o: result.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
+result.o: ../../../include/ldif.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index 112c4abbd8..14b013ad30 100644
--- a/servers/slapd/tools/Make-template
+++ b/servers/slapd/tools/Make-template
@@ -178,42 +178,30 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-chlog2replog.o: chlog2replog.c ../../../include/ldif.h
-edb2ldif.o: edb2ldif.c
-ldapsyntax.o: ldapsyntax.c ../../../include/lber.h ../../../include/ldap.h
-ldapsyntax.o: ../../../include/ldif.h ldapsyntax.h
-ldif2index.o: ldif2index.c ../slap.h ../../../include/avl.h
-ldif2index.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2index.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.o: ldif2ldbm.c ../slap.h ../../../include/avl.h
-ldif2ldbm.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2ldbm.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif2id2entry.o: ldif2id2entry.c ../slap.h ../../../include/avl.h
-ldif2id2entry.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2id2entry.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2id2entry.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif2id2children.o: ldif2id2children.c ../slap.h ../../../include/avl.h
-ldif2id2children.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2id2children.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2id2children.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldbmcat.o: ldbmcat.c ../../../include/ldbm.h ../slap.h ../../../include/avl.h
-ldbmcat.o: ../../../include/lber.h ../../../include/ldap.h
-ldbmcat.o: ../../../include/lthread.h ../../../include/ldif.h
-centipede.o: centipede.c ../../../include/lber.h ../../../include/ldap.h
-centipede.o: ../../../include/ldapconfig.h ../../../include/ldbm.h
-sizecount.o: sizecount.c ../../../include/ldbm.h ../../../include/lber.h
-sizecount.o: ../../../include/ldap.h ../../../include/portable.h
-ldif2ldbm.sed.o: ldif2ldbm.sed.c ../slap.h ../../../include/avl.h
-ldif2ldbm.sed.o: ../../../include/lber.h ../../../include/ldap.h
-ldif2ldbm.sed.o: ../../../include/lthread.h ../../../include/ldif.h
-ldif2ldbm.sed.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldbmtest.o: ldbmtest.c ../../../include/portable.h
-ldbmtest.o: ../../../include/ldapconfig.h ../slap.h ../../../include/avl.h
-ldbmtest.o: ../../../include/lber.h ../../../include/ldap.h
-ldbmtest.o: ../../../include/lthread.h ../../../include/ldif.h
-ldbmtest.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h
-ldif.o: ldif.c ../../../include/lber.h ../../../include/ldap.h
-ldif.o: ../../../include/ldif.h
+ldif2index.o: ldif2index.c ../../../include/avl.h ../../../include/proto-lber.h
+ldif2index.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+ldif2ldbm.o: ldif2ldbm.c ../../../include/proto-lber.h
+ldif2ldbm.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+ldif2ldbm.o: ../../../include/ldbm.h
+ldif2id2entry.o: ldif2id2entry.c ../../../include/avl.h
+ldif2id2entry.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldif2id2entry.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldif2id2children.o: ldif2id2children.c ../../../include/avl.h
+ldif2id2children.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldif2id2children.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldbmcat.o: ldbmcat.c ../../../include/proto-lber.h
+ldbmcat.o: ../../../include/proto-ldap.h ../../../include/ldif.h
+centipede.o: centipede.c ../../../include/proto-lber.h
+centipede.o: ../../../include/proto-ldap.h ../../../include/ldbm.h
+sizecount.o: sizecount.c ../../../include/lber.h ../../../include/ldap.h
+sizecount.o: ../../../include/proto-ldap.h
+ldif2ldbm.sed.o: ldif2ldbm.sed.c ../../../include/avl.h
+ldif2ldbm.sed.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldif2ldbm.sed.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldbmtest.o: ldbmtest.c ../../../include/ldapconfig.h ../../../include/avl.h
+ldbmtest.o: ../../../include/proto-lber.h ../../../include/proto-ldap.h
+ldbmtest.o: ../../../include/ldif.h ../../../include/ldbm.h
+ldbmtest.o: ../back-ldbm/proto-back-ldbm.h
+ldif.o: ldif.c ../../../include/proto-lber.h ../../../include/proto-ldap.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/servers/slapd/tools/ldif2id2children.c b/servers/slapd/tools/ldif2id2children.c
index 2fb2aaf603..b53ed8cdd3 100644
--- a/servers/slapd/tools/ldif2id2children.c
+++ b/servers/slapd/tools/ldif2id2children.c
@@ -121,7 +121,7 @@ main( int argc, char **argv )
 			fprintf( stderr, "No ldbm database found in config file\n" );
 			exit( 1 );
 		}
-	} else if ( dbnum < 1 || dbnum > nbackends ) {
+	} else if ( dbnum < 0 || dbnum > (nbackends-1) ) {
 		fprintf( stderr, "Database number selected via -n is out of range\n" );
 		fprintf( stderr, "Must be in the range 1 to %d (number of databases in the config file)\n", nbackends );
 		exit( 1 );
diff --git a/servers/slapd/tools/ldif2id2entry.c b/servers/slapd/tools/ldif2id2entry.c
index 5c8874c513..be25c22644 100644
--- a/servers/slapd/tools/ldif2id2entry.c
+++ b/servers/slapd/tools/ldif2id2entry.c
@@ -117,7 +117,7 @@ main( int argc, char **argv )
 			fprintf( stderr, "No ldbm database found in config file\n" );
 			exit( 1 );
 		}
-	} else if ( dbnum < 1 || dbnum > nbackends ) {
+	} else if ( dbnum < 0 || dbnum > (nbackends-1) ) {
 		fprintf( stderr, "Database number selected via -n is out of range\n" );
 		fprintf( stderr, "Must be in the range 1 to %d (number of databases in the config file)\n", nbackends );
 		exit( 1 );
diff --git a/servers/slapd/tools/ldif2index.c b/servers/slapd/tools/ldif2index.c
index af377f6751..20156d2b7d 100644
--- a/servers/slapd/tools/ldif2index.c
+++ b/servers/slapd/tools/ldif2index.c
@@ -108,7 +108,7 @@ main( int argc, char **argv )
 			fprintf( stderr, "No ldbm database found in config file\n" );
 			exit( 1 );
 		}
-	} else if ( dbnum < 1 || dbnum > nbackends ) {
+	} else if ( dbnum < 0 || dbnum > (nbackends-1) ) {
 		fprintf( stderr, "Database number selected via -n is out of range\n" );
 		fprintf( stderr, "Must be in the range 1 to %d (number of databases in the config file)\n", nbackends );
 		exit( 1 );
diff --git a/servers/slapd/tools/ldif2ldbm.c b/servers/slapd/tools/ldif2ldbm.c
index b2caa7b3cc..79e8c25a85 100644
--- a/servers/slapd/tools/ldif2ldbm.c
+++ b/servers/slapd/tools/ldif2ldbm.c
@@ -135,7 +135,7 @@ main( int argc, char **argv )
 			fprintf( stderr, "No ldbm database found in config file\n" );
 			exit( 1 );
 		}
-	} else if ( dbnum < 0 || dbnum > nbackends ) {
+	} else if ( dbnum < 0 || dbnum > (nbackends-1) ) {
 		fprintf( stderr, "Database number selected via -n is out of range\n" );
 		fprintf( stderr, "Must be in the range 1 to %d (number of databases in the config file)\n", nbackends );
 		exit( 1 );
@@ -157,7 +157,7 @@ main( int argc, char **argv )
 	args[i++] = "-f";
 	args[i++] = tailorfile;
 	args[i++] = "-n";
-	sprintf( buf2, "%d", dbnum );
+	sprintf( buf2, "%d", dbnum+1 );
 	args[i++] = buf2;
 	if ( ldap_debug ) {
 		sprintf( buf3, "%d", ldap_debug );
@@ -179,7 +179,7 @@ main( int argc, char **argv )
 	args[i++] = "-f";
 	args[i++] = tailorfile;
 	args[i++] = "-n";
-	sprintf( buf2, "%d", dbnum );
+	sprintf( buf2, "%d", dbnum+1 );
 	args[i++] = buf2;
 	if ( ldap_debug ) {
 		sprintf( buf3, "%d", ldap_debug );
@@ -201,7 +201,7 @@ main( int argc, char **argv )
 	args[i++] = "-f";
 	args[i++] = tailorfile;
 	args[i++] = "-n";
-	sprintf( buf2, "%d", dbnum );
+	sprintf( buf2, "%d", dbnum+1 );
 	args[i++] = buf2;
 	if ( ldap_debug ) {
 		sprintf( buf3, "%d", ldap_debug );
diff --git a/servers/slurpd/Make-template b/servers/slurpd/Make-template
index a43494093d..04beedfaec 100644
--- a/servers/slurpd/Make-template
+++ b/servers/slurpd/Make-template
@@ -81,67 +81,42 @@ links:
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-admin.o: admin.c slurp.h ../../include/lber.h ../../include/ldap.h
-admin.o: ../../include/lthread.h ../../include/portable.h
-admin.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-args.o: args.c ../../include/lber.h ../../include/ldap.h slurp.h
-args.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-args.o: ../../include/portable.h ../../include/ldapconfig.h
-args.o: ../../include/ldif.h globals.h slurp.h
-ch_malloc.o: ch_malloc.c ../slapd/slap.h ../../include/avl.h
-ch_malloc.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-ch_malloc.o: ../../include/ldif.h
-config.o: config.c ../../include/lber.h ../../include/ldap.h slurp.h
-config.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-config.o: ../../include/portable.h ../../include/ldapconfig.h
-config.o: ../../include/ldif.h globals.h slurp.h
-detach.o: detach.c ../../include/portable.h
-fm.o: fm.c slurp.h ../../include/lber.h ../../include/ldap.h
-fm.o: ../../include/lthread.h ../../include/portable.h
-fm.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-globals.o: globals.c slurp.h ../../include/lber.h ../../include/ldap.h
-globals.o: ../../include/lthread.h ../../include/portable.h
-globals.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-ldap_op.o: ldap_op.c ../../include/lber.h ../../include/ldap.h
-ldap_op.o: ../../include/portable.h slurp.h ../../include/lber.h
-ldap_op.o: ../../include/ldap.h ../../include/lthread.h
-ldap_op.o: ../../include/portable.h ../../include/ldapconfig.h
-ldap_op.o: ../../include/ldif.h
-lock.o: lock.c ../../include/portable.h ../slapd/slap.h ../../include/avl.h
-lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-lock.o: ../../include/ldif.h
-main.o: main.c slurp.h ../../include/lber.h ../../include/ldap.h
-main.o: ../../include/lthread.h ../../include/portable.h
-main.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-re.o: re.c ../slapd/slap.h ../../include/avl.h ../../include/lber.h
-re.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h slurp.h
-re.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h
-re.o: ../../include/portable.h ../../include/ldapconfig.h ../../include/ldif.h
-re.o: globals.h slurp.h
-reject.o: reject.c slurp.h ../../include/lber.h ../../include/ldap.h
-reject.o: ../../include/lthread.h ../../include/portable.h
-reject.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-replica.o: replica.c slurp.h ../../include/lber.h ../../include/ldap.h
-replica.o: ../../include/lthread.h ../../include/portable.h
-replica.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-replog.o: replog.c ../../include/portable.h slurp.h ../../include/lber.h
-replog.o: ../../include/ldap.h ../../include/lthread.h ../../include/portable.h
-replog.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-ri.o: ri.c slurp.h ../../include/lber.h ../../include/ldap.h
-ri.o: ../../include/lthread.h ../../include/portable.h
-ri.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-rq.o: rq.c slurp.h ../../include/lber.h ../../include/ldap.h
-rq.o: ../../include/lthread.h ../../include/portable.h
-rq.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-sanity.o: sanity.c slurp.h ../../include/lber.h ../../include/ldap.h
-sanity.o: ../../include/lthread.h ../../include/portable.h
-sanity.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-sanity.o: ../../include/portable.h
-st.o: st.c slurp.h ../../include/lber.h ../../include/ldap.h
-st.o: ../../include/lthread.h ../../include/portable.h
-st.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
-tsleep.o: tsleep.c slurp.h ../../include/lber.h ../../include/ldap.h
-tsleep.o: ../../include/lthread.h ../../include/portable.h
-tsleep.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h
+admin.o: admin.c ../../include/lber.h ../../include/proto-ldap.h
+admin.o: ../../include/portable.h ../../include/ldif.h
+args.o: args.c ../../include/lber.h ../../include/proto-ldap.h
+args.o: ../../include/lthread.h ../../include/ldapconfig.h
+ch_malloc.o: ch_malloc.c ../../include/avl.h ../../include/ldap.h
+ch_malloc.o: ../../include/lthread.h
+config.o: config.c ../../include/lber.h ../../include/proto-ldap.h
+config.o: ../../include/lthread.h ../../include/ldapconfig.h
+detach.o: detach.c
+fm.o: fm.c ../../include/lber.h ../../include/proto-ldap.h
+fm.o: ../../include/portable.h ../../include/ldif.h
+globals.o: globals.c ../../include/lber.h ../../include/proto-ldap.h
+globals.o: ../../include/portable.h ../../include/ldif.h
+ldap_op.o: ldap_op.c ../../include/proto-lber.h ../../include/proto-ldap.h
+ldap_op.o: ../../include/lthread.h ../../include/ldif.h
+lock.o: lock.c ../../include/portable.h ../../include/avl.h
+lock.o: ../../include/ldap.h ../../include/lthread.h
+main.o: main.c ../../include/lber.h ../../include/proto-ldap.h
+main.o: ../../include/portable.h ../../include/ldif.h
+re.o: re.c ../slapd/slap.h ../../include/lber.h ../../include/proto-ldap.h
+re.o: ../../include/ldif.h ../../include/portable.h
+reject.o: reject.c ../../include/lber.h ../../include/proto-ldap.h
+reject.o: ../../include/portable.h ../../include/ldif.h
+replica.o: replica.c ../../include/lber.h ../../include/proto-ldap.h
+replica.o: ../../include/portable.h ../../include/ldif.h
+replog.o: replog.c ../../include/portable.h ../../include/proto-lber.h
+replog.o: ../../include/proto-ldap.h ../../include/ldapconfig.h
+ri.o: ri.c ../../include/lber.h ../../include/proto-ldap.h
+ri.o: ../../include/portable.h ../../include/ldif.h
+rq.o: rq.c ../../include/lber.h ../../include/proto-ldap.h
+rq.o: ../../include/portable.h ../../include/ldif.h
+sanity.o: sanity.c ../../include/lber.h ../../include/proto-ldap.h
+sanity.o: ../../include/portable.h ../../include/ldif.h
+st.o: st.c ../../include/lber.h ../../include/proto-ldap.h
+st.o: ../../include/portable.h ../../include/ldif.h
+tsleep.o: tsleep.c ../../include/lber.h ../../include/proto-ldap.h
+tsleep.o: ../../include/portable.h ../../include/ldif.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY