From d2ef362f99f3fe5d5d2bb56ce2b4a96a08dbb41d Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 20 Aug 1998 03:56:19 +0000
Subject: [PATCH] Removed use of paths not defined in ldapconfig.h.edit. Fixed
Dependency Generation not to mess with Make-templates. side effect:
depends are not carried forward after "make makefiles"
---
Makefile | 8 +--
build/Make-append | 2 +-
clients/fax500/Make-template | 10 ---
clients/fax500/main.c | 2 +-
clients/fax500/rp500.c | 12 ++--
clients/finger/Make-template | 7 --
clients/finger/main.c | 4 +-
clients/gopher/Make-template | 11 ---
clients/gopher/go500.c | 2 +-
clients/mail500/Make-template | 7 --
clients/rcpt500/Make-template | 10 ---
clients/tools/Make-template | 13 ----
clients/tools/ldapdelete.c | 2 +-
clients/tools/ldapmodify.c | 2 +-
clients/tools/ldapmodrdn.c | 2 +-
clients/tools/ldapsearch.c | 2 +-
clients/ud/Make-template | 20 +-----
clients/ud/auth.c | 2 +-
clients/ud/main.c | 2 +-
include/ldapconfig.h.edit | 69 +++++++++++++------
libraries/libavl/Make-template | 6 --
libraries/liblber/Make-template | 9 ---
libraries/libldap/Make-template | 46 +------------
libraries/libldap/tmplout.c | 2 +
libraries/libldap/ufn.c | 2 +
libraries/libldbm/Make-template | 6 --
libraries/libldif/Make-template | 6 --
libraries/liblthread/Make-template | 7 --
servers/ldapd/Make-template | 27 +-------
servers/slapd/Make-template | 80 ----------------------
servers/slapd/back-ldbm/Make-template | 59 ----------------
servers/slapd/back-passwd/Make-template | 9 ---
servers/slapd/back-shell/Make-template | 30 --------
servers/slapd/shell-backends/Make-template | 4 --
servers/slapd/tools/Make-template | 37 +---------
servers/slurpd/Make-template | 42 ------------
36 files changed, 82 insertions(+), 479 deletions(-)
diff --git a/Makefile b/Makefile
index be002db16b..c24805526f 100644
--- a/Makefile
+++ b/Makefile
@@ -161,8 +161,7 @@ depend: makeconfig
for i in $(SRCDIRS); do \
echo; echo "cd $$i; $(MAKE) $(MFLAGS) depend"; \
( cd $$i; $(MAKE) $(MFLAGS) depend ); \
- done; \
- $(MAKE) $(MFLAGS) makefiles
+ done;
#
# rules to check out and in Make-template files
@@ -350,12 +349,13 @@ Make-common: Make-common.dist
echo " creating $$i/Makefile"; \
$(RM) $$i/Makefile; \
$(CAT) $$HDRFILE $$i/Make-template $$DEFSFILE > $$i/Makefile; \
- $(CHMOD) 444 $$i/Makefile; \
fi; \
done; \
$(RM) .makefiles; \
touch .makefiles; \
- $(RM) $$HDRFILE $$DEFSFILE
+ $(RM) $$HDRFILE $$DEFSFILE \
+ echo "Please \"make depend\" before building."
+
#
# rule to always build makefiles
diff --git a/build/Make-append b/build/Make-append
index a899b45051..a841639e79 100644
--- a/build/Make-append
+++ b/build/Make-append
@@ -66,7 +66,7 @@ INSTALL = install
INSTALLFLAGS = -c
BASENAME= basename
DIRNAME = dirname
-MKDEP = $(LDAPSRC)/build/mkdep -s -f Make-template
+MKDEP = $(LDAPSRC)/build/mkdep -s -f Makefile
PWD = pwd
DATE = date
HOSTNAME= hostname
diff --git a/clients/fax500/Make-template b/clients/fax500/Make-template
index 896a969d63..2851ce08ed 100644
--- a/clients/fax500/Make-template
+++ b/clients/fax500/Make-template
@@ -75,13 +75,3 @@ depend: FORCE
links:
@$(LN) .src/README .src/xrpcomp .src/*.[ch] .
-# 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/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/fax500/main.c b/clients/fax500/main.c
index 7481d4980e..197b59a217 100644
--- a/clients/fax500/main.c
+++ b/clients/fax500/main.c
@@ -308,7 +308,7 @@ connect_to_x500()
ld->ld_sizelimit = FAX_MAXAMBIGUOUS;
ld->ld_deref = LDAP_DEREF_ALWAYS;
- if ( ldap_simple_bind_s( ld, FAX_BINDDN, NULL ) != LDAP_SUCCESS ) {
+ if ( ldap_simple_bind_s( ld, FAX_BINDDN, FAX_BIND_CRED ) != LDAP_SUCCESS ) {
syslog( LOG_ALERT, "ldap_simple_bind_s failed" );
return( -1 );
}
diff --git a/clients/fax500/rp500.c b/clients/fax500/rp500.c
index 25eece609d..46be50f772 100644
--- a/clients/fax500/rp500.c
+++ b/clients/fax500/rp500.c
@@ -22,16 +22,18 @@
#include <sys/resource.h>
#include <sys/wait.h>
#include <signal.h>
+
+#include <lber.h>
+#include <ldap.h>
+
#include <ldapconfig.h>
-#include "lber.h"
-#include "ldap.h"
#define DEFAULT_PORT 79
#define DEFAULT_SIZELIMIT 50
int debug;
-char *ldaphost = LDAPHOST;
-char *base = DEFAULT_BASE;
+char *ldaphost = LDAPHOST;
+char *base = RP_BASE;
int deref;
int sizelimit;
LDAPFiltDesc *filtd;
@@ -114,7 +116,7 @@ main (argc, argv)
ld->ld_sizelimit = sizelimit ? sizelimit : DEFAULT_SIZELIMIT;
ld->ld_deref = deref;
- if ( ldap_simple_bind_s( ld, RP_BINDDN, NULL ) != LDAP_SUCCESS ) {
+ if ( ldap_simple_bind_s( ld, RP_BINDDN, RP_BIND_CRED ) != LDAP_SUCCESS ) {
fprintf( stderr, "X.500 is temporarily unavailable.\n" );
ldap_perror( ld, "ldap_simple_bind_s" );
exit( -1 );
diff --git a/clients/finger/Make-template b/clients/finger/Make-template
index 3262f9c6b2..fbcefd8cdf 100644
--- a/clients/finger/Make-template
+++ b/clients/finger/Make-template
@@ -60,10 +60,3 @@ depend: FORCE
links:
@$(LN) .src/README .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-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/finger/main.c b/clients/finger/main.c
index 613916c7dd..5acb901d1f 100644
--- a/clients/finger/main.c
+++ b/clients/finger/main.c
@@ -168,7 +168,9 @@ static do_query()
ld->ld_sizelimit = FINGER_SIZELIMIT;
ld->ld_deref = deref;
- if ( ldap_simple_bind_s( ld, FINGER_BINDDN, NULL ) != LDAP_SUCCESS ) {
+ if ( ldap_simple_bind_s( ld, FINGER_BINDDN, FINGER_BIND_CRED )
+ != LDAP_SUCCESS )
+ {
fprintf( stderr, FINGER_UNAVAILABLE );
ldap_perror( ld, "ldap_simple_bind_s" );
exit( 1 );
diff --git a/clients/gopher/Make-template b/clients/gopher/Make-template
index 2c5668eeb3..0ab0cfad82 100644
--- a/clients/gopher/Make-template
+++ b/clients/gopher/Make-template
@@ -77,14 +77,3 @@ depend: FORCE
links:
@$(LN) .src/README .src/*.help .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-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
-setproctitle.o: setproctitle.c
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c
index 0697904295..42cb5e4f6d 100644
--- a/clients/gopher/go500.c
+++ b/clients/gopher/go500.c
@@ -379,7 +379,7 @@ int s;
}
ld->ld_deref = GO500_DEREF;
- if ( (rc = ldap_simple_bind_s( ld, GO500_BINDDN, NULL ))
+ if ( (rc = ldap_simple_bind_s( ld, GO500_BINDDN, GO500_BIND_CRED ))
!= LDAP_SUCCESS ) {
fprintf(fp,
"0An error occurred (explanation)\t@%d\t%s\t%d\r\n",
diff --git a/clients/mail500/Make-template b/clients/mail500/Make-template
index 959ca7cae0..54fc974526 100644
--- a/clients/mail500/Make-template
+++ b/clients/mail500/Make-template
@@ -59,10 +59,3 @@ depend: FORCE
links:
@$(LN) .src/README .src/sendmail.cf .src/*.[ch] .
-# 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/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 1960d5902f..ef1b3e752f 100644
--- a/clients/rcpt500/Make-template
+++ b/clients/rcpt500/Make-template
@@ -58,13 +58,3 @@ depend: FORCE
links:
@$(LN) .src/README .src/*.[ch] .src/*.help .
-# 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
-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 bb2b5f54e2..09504f9136 100644
--- a/clients/tools/Make-template
+++ b/clients/tools/Make-template
@@ -103,16 +103,3 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# 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/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/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index d827575476..29a372df59 100644
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -12,8 +12,8 @@
#include "ldapconfig.h"
static char *binddn = LDAPDELETE_BINDDN;
+static char *passwd = LDAPDELETE_BIND_CRED;
static char *base = LDAPDELETE_BASE;
-static char *passwd = NULL;
static char *ldaphost = LDAPHOST;
static int ldapport = LDAP_PORT;
static int not, verbose, contoper;
diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index d09b9ad839..9d9cd2263f 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -19,7 +19,7 @@
static char *prog;
static char *binddn = LDAPMODIFY_BINDDN;
-static char *passwd = NULL;
+static char *passwd = LDAPMODIFY_BIND_CRED;
static char *ldaphost = LDAPHOST;
static int ldapport = LDAP_PORT;
static int new, replace, not, verbose, contoper, force, valsfromfiles;
diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 3db722aa07..0cf4a23ee5 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -12,8 +12,8 @@
#include "ldapconfig.h"
static char *binddn = LDAPMODRDN_BINDDN;
+static char *passwd = LDAPMODRDN_BIND_CRED;
static char *base = LDAPMODRDN_BASE;
-static char *passwd = NULL;
static char *ldaphost = LDAPHOST;
static int ldapport = LDAP_PORT;
static int not, verbose, contoper;
diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 5d39297337..723d767662 100644
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -54,7 +54,7 @@ char *s;
}
static char *binddn = LDAPSEARCH_BINDDN;
-static char *passwd = NULL;
+static char *passwd = LDAPSEARCH_BIND_CRED;
static char *base = LDAPSEARCH_BASE;
static char *ldaphost = LDAPHOST;
static int ldapport = LDAP_PORT;
diff --git a/clients/ud/Make-template b/clients/ud/Make-template
index 7f448d3f9f..695c5abb8d 100644
--- a/clients/ud/Make-template
+++ b/clients/ud/Make-template
@@ -29,8 +29,7 @@ OBJS= main.o find.o mod.o print.o auth.o util.o help.o\
HDRS= ud.h
INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG)
-DEFINES= $(DEFS) -DDEBUG -DCONFIG_FILE=\"$(LDAP_ETCDIR)/ud.conf\" \
- -DLDAP_FRIENDLY_MAP_FILE=\"$(LDAP_ETCDIR)/ldapfriendly\"
+DEFINES= $(DEFS) -DDEBUG
TERMLIB= -ltermcap
CFLAGS= ${INCLUDES} ${DEFINES} ${ACFLAGS}
@@ -77,20 +76,3 @@ lint: FORCE
links:
@$(LN) .src/README .src/etc.ud.conf .src/*.[ch] .
-# 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/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/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/clients/ud/auth.c b/clients/ud/auth.c
index be4727695b..9e4c657639 100644
--- a/clients/ud/auth.c
+++ b/clients/ud/auth.c
@@ -251,7 +251,7 @@ int implicit;
else
ldap_perror(ld, "ldap_bind_s" );
(void) ldap_bind_s(ld, default_bind_object,
- (char *) UD_PASSWD, LDAP_AUTH_SIMPLE);
+ (char *) UD_BIND_CRED, LDAP_AUTH_SIMPLE);
if (default_bind_object == NULL)
set_bound_dn(NULL);
else
diff --git a/clients/ud/main.c b/clients/ud/main.c
index be9508dba9..e3d4e795f4 100644
--- a/clients/ud/main.c
+++ b/clients/ud/main.c
@@ -632,7 +632,7 @@ initialize_client()
exit(0);
/* NOTREACHED */
}
- if (ldap_bind_s(ld, (char *) default_bind_object, (char *) UD_PASSWD,
+ if (ldap_bind_s(ld, (char *) default_bind_object, (char *) UD_BIND_CRED,
LDAP_AUTH_SIMPLE) != LDAP_SUCCESS) {
fprintf(stderr, " The X.500 Directory is temporarily unavailable. Please try again later.\n");
if (ld->ld_errno != LDAP_UNAVAILABLE)
diff --git a/include/ldapconfig.h.edit b/include/ldapconfig.h.edit
index 265410e2a1..9bf23812d4 100644
--- a/include/ldapconfig.h.edit
+++ b/include/ldapconfig.h.edit
@@ -22,16 +22,29 @@
/*
* SHARED DEFINITIONS - things you should change
*/
- /* default ldap host */
-#define LDAPHOST "localhost"
- /* default place to start searching */
-#define DEFAULT_BASE "o=Your Organization Name, c=US"
-
#define DEFAULT_BINDIR "%BINDIR%"
#define DEFAULT_SBINDIR "%SBINDIR%"
#define DEFAULT_ETCDIR "%ETCDIR%"
#define DEFAULT_LIBEXECDIR "%LIBEXECDIR%"
+/* default ldap host */
+#define LDAPHOST "localhost"
+
+#define DEFAULT_LDAPHOST_FILE "%ETCDIR%/ldaphost"
+/* default place to start searching */
+#define DEFAULT_BASE "o=Your Organization Name, c=US"
+#define DEFAULT_BASE_FILE "%ETCDIR%/ldapbase"
+
+/*
+ * default binddn and creditials
+ * use files, make sure they are not generally readable
+ */
+#define DEFAULT_BINDDN NULL
+#define DEFAULT_BINDDN_FILE "%ETCDIR%/ldapbinddn"
+
+#define DEFAULT_BIND_CRED NULL
+#define DEFAULT_BIND_CRED_FILE "%ETCDIR%/ldapbindcred"
+
/*********************************************************************
* *
* You probably do not need to edit anything below this point *
@@ -55,18 +68,19 @@
* FINGER DEFINITIONS
*/
/* who to bind as */
-#define FINGER_BINDDN NULL
+#define FINGER_BINDDN NULL
+#define FINGER_BIND_CRED NULL
/* where to search */
-#define FINGER_BASE DEFAULT_BASE
+#define FINGER_BASE DEFAULT_BASE
/* banner to print */
#define FINGER_BANNER "X.500 Finger Service...\r\n"
/* who to report errors to */
-#define FINGER_ERRORS "your local system administrator"
+#define FINGER_ERRORS "System Administrator"
/* what to say if no matches are found */
#define FINGER_NOMATCH "Search failed to find anything.\r\n"
/* what to say if the service may be unavailable */
#define FINGER_UNAVAILABLE \
-"The X.500 service may be temporarily unavailable.\r\n\
+"The directory service may be temporarily unavailable.\r\n\
Please try again later.\r\n"
/* printed if a match has no email address - for disptmp default */
#define FINGER_NOEMAIL1 "None registered in this service."
@@ -94,6 +108,7 @@ Please try again later.\r\n"
*/
/* who to bind as */
#define GO500_BINDDN NULL
+#define GO500_BIND_CRED NULL
/* where to search */
#define GO500_BASE DEFAULT_BASE
/* port on which to listen */
@@ -118,7 +133,8 @@ Please try again later.\r\n"
* GO500GW GOPHER GATEWAY DEFINITIONS
*/
/* who to bind as */
-#define GO500GW_BINDDN NULL
+#define GO500GW_BINDDN NULL
+#define GO500GW_BIND_CRED NULL
/* where the helpfile lives */
#define GO500GW_HELPFILE "%ETCDIR%/go500gw.help"
/* port on which to listen */
@@ -142,12 +158,13 @@ Please try again later.\r\n"
*/
/* who to bind as */
#define RCPT500_BINDDN NULL
+#define RCPT500_BIND_CRED NULL
/* where the helpfile lives */
#define RCPT500_HELPFILE "%ETCDIR%/rcpt500.help"
/* maximum number of matches returned */
#define RCPT500_SIZELIMIT 50
/* address replies will appear to come from */
-#define RCPT500_FROM "\"X.500 Query Program\" <X500-Query>"
+#define RCPT500_FROM "\"Directory Query Program\" <Dir-Query>"
/* command that will accept an RFC822 message text on standard
input, and send it. sendmail -t does this nicely. */
#define RCPT500_PIPEMAILCMD "%SENDMAIL% -t"
@@ -166,7 +183,8 @@ Please try again later.\r\n"
* LDAPSEARCH TOOL
*/
/* who to bind as */
-#define LDAPSEARCH_BINDDN NULL
+#define LDAPSEARCH_BINDDN NULL
+#define LDAPSEARCH_BIND_CRED NULL
/* search base */
#define LDAPSEARCH_BASE DEFAULT_BASE
@@ -174,7 +192,8 @@ Please try again later.\r\n"
* LDAPMODIFY TOOL
*/
/* who to bind as */
-#define LDAPMODIFY_BINDDN NULL
+#define LDAPMODIFY_BINDDN NULL
+#define LDAPMODIFY_BIND_CRED NULL
/* search base */
#define LDAPMODIFY_BASE DEFAULT_BASE
@@ -182,7 +201,8 @@ Please try again later.\r\n"
* LDAPDELETE TOOL
*/
/* who to bind as */
-#define LDAPDELETE_BINDDN NULL
+#define LDAPDELETE_BINDDN NULL
+#define LDAPDELETE_BIND_CRED NULL
/* search base */
#define LDAPDELETE_BASE DEFAULT_BASE
@@ -190,7 +210,8 @@ Please try again later.\r\n"
* LDAPMODRDN TOOL
*/
/* who to bind as */
-#define LDAPMODRDN_BINDDN NULL
+#define LDAPMODRDN_BINDDN NULL
+#define LDAPMODRDN_BIND_CRED NULL
/* search base */
#define LDAPMODRDN_BASE DEFAULT_BASE
@@ -198,7 +219,8 @@ Please try again later.\r\n"
* MAIL500 MAILER DEFINITIONS
*/
/* who to bind as */
-#define MAIL500_BINDDN NULL
+#define MAIL500_BINDDN NULL
+#define MAIL500_BIND_CRED NULL
/* max number of ambiguous matches reported */
#define MAIL500_MAXAMBIGUOUS 10
/* max subscribers allowed (size limit when searching for them ) */
@@ -220,9 +242,9 @@ Please try again later.\r\n"
/* default user to bind as */
#define UD_BINDDN NULL
/* default password to bind with */
-#define UD_PASSWD NULL
+#define UD_BIND_CRED NULL
/* default search base */
-#define UD_BASE DEFAULT_BASE
+#define UD_BASE DEFAULT_BASE
/* default base where groups are created */
#define UD_WHERE_GROUPS_ARE_CREATED ""
/* default base below which all groups live */
@@ -232,7 +254,10 @@ Please try again later.\r\n"
* FAX500 DEFINITIONS
*/
/* what to bind as */
-#define FAX_BINDDN NULL
+#define FAX_BINDDN NULL
+#define FAX_BIND_CRED NULL
+ /* default search base */
+#define FAX_BASE DEFAULT_BASE
/* how long to wait for searches */
#define FAX_TIMEOUT 180
/* maximum number of ambiguous matches reported */
@@ -246,7 +271,11 @@ Please try again later.\r\n"
* RP500 DEFINITIONS
*/
/* what to bind as */
-#define RP_BINDDN NULL
+#define RP_BINDDN NULL
+#define RP_BIND_CRED NULL
+ /* default search base */
+#define RP_BASE DEFAULT_BASE
+
/* prefix to add to non-fully-qualified numbers */
#define RP_PHONEPREFIX ""
diff --git a/libraries/libavl/Make-template b/libraries/libavl/Make-template
index 470737973d..53248a0987 100644
--- a/libraries/libavl/Make-template
+++ b/libraries/libavl/Make-template
@@ -63,9 +63,3 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-avl.o: avl.c ../../include/avl.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/libraries/liblber/Make-template b/libraries/liblber/Make-template
index 63c83b8784..5ef929a01c 100644
--- a/libraries/liblber/Make-template
+++ b/libraries/liblber/Make-template
@@ -74,12 +74,3 @@ depend: FORCE
links:
@$(LN) .src/ldap* .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-decode.o: decode.c ../../include/proto-lber.h
-encode.o: encode.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 2210efe208..41c7b35c3d 100644
--- a/libraries/libldap/Make-template
+++ b/libraries/libldap/Make-template
@@ -31,8 +31,7 @@ OBJS = bind.o open.o result.o error.o compare.o search.o \
HDIR = ../../include
INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG)
-DEFINES = $(DEFS) -DFILTERFILE="\"$(LDAP_ETCDIR)/ldapfilter.conf\"" \
- -DTEMPLATEFILE="\"$(LDAP_ETCDIR)/ldaptemplates.conf\""
+DEFINES = $(DEFS)
CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS)
LIBS = -L. -L../liblber -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS)
@@ -93,46 +92,3 @@ links:
@$(LN) .src/*.[ch] .src/ldapfriendly .src/ldapfilter.conf \
.src/ldaptemplates.conf .src/ldapsearchprefs.conf .
-# 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/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/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/libldap/tmplout.c b/libraries/libldap/tmplout.c
index 330527b421..c53d935757 100644
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -29,6 +29,8 @@
#include "ldap.h"
#include "disptmpl.h"
+#include "ldapconfig.h"
+
#ifdef NEEDPROTOS
static int do_entry2text( LDAP *ld, char *buf, char *base, LDAPMessage *entry,
struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
diff --git a/libraries/libldap/ufn.c b/libraries/libldap/ufn.c
index 9596adf131..5827ca12b7 100644
--- a/libraries/libldap/ufn.c
+++ b/libraries/libldap/ufn.c
@@ -29,6 +29,8 @@ static char copyright[] = "@(#) Copyright (c) 1993 Regents of the University of
#include "lber.h"
#include "ldap.h"
+#include "ldapconfig.h"
+
#ifdef NEEDPROTOS
typedef int (*cancelptype)( void *cancelparm );
#else /* NEEDPROTOS */
diff --git a/libraries/libldbm/Make-template b/libraries/libldbm/Make-template
index ac7df08700..4ebd4527e5 100644
--- a/libraries/libldbm/Make-template
+++ b/libraries/libldbm/Make-template
@@ -63,9 +63,3 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-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 319cc51cb5..99c4e5be7e 100644
--- a/libraries/libldif/Make-template
+++ b/libraries/libldif/Make-template
@@ -60,9 +60,3 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-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 c0721b1890..755190983b 100644
--- a/libraries/liblthread/Make-template
+++ b/libraries/liblthread/Make-template
@@ -60,10 +60,3 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-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/ldapd/Make-template b/servers/ldapd/Make-template
index c615f24efd..e7d5388c4f 100644
--- a/servers/ldapd/Make-template
+++ b/servers/ldapd/Make-template
@@ -94,29 +94,4 @@ depend: FORCE
links:
@$(LN) .src/*.py .src/*.[ch] .
-# 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 common.h
-detach.o: detach.c ../../include/portable.h
-setproctitle.o: setproctitle.c
-request.o: request.c ../../include/lber.h ../../include/ldap.h common.h
-bind.o: bind.c ../../include/lber.h ../../include/ldap.h common.h
-result.o: result.c ../../include/lber.h ../../include/ldap.h common.h
-error.o: error.c ../../include/lber.h ../../include/ldap.h
-search.o: search.c ../../include/lber.h ../../include/ldap.h common.h
-util.o: util.c ../../include/lber.h ../../include/ldap.h common.h
-compare.o: compare.c ../../include/lber.h ../../include/ldap.h common.h
-message.o: message.c ../../include/lber.h ../../include/ldap.h common.h
-add.o: add.c ../../include/lber.h ../../include/ldap.h common.h
-delete.o: delete.c ../../include/lber.h ../../include/ldap.h common.h
-modrdn.o: modrdn.c ../../include/lber.h ../../include/ldap.h common.h
-modify.o: modify.c ../../include/lber.h ../../include/ldap.h common.h
-abandon.o: abandon.c ../../include/lber.h ../../include/ldap.h common.h
-syntax.o: syntax.c ../../include/lber.h ../../include/ldap.h common.h
-association.o: association.c ../../include/lber.h ../../include/ldap.h common.h
-kerberos.o: kerberos.c ../../include/lber.h ../../include/ldap.h common.h
-certificate.o: certificate.c ../../include/lber.h ../../include/ldap.h common.h
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
+
diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template
index f151019379..82e6147d1b 100644
--- a/servers/slapd/Make-template
+++ b/servers/slapd/Make-template
@@ -165,83 +165,3 @@ links:
fi; \
done;
-
-# 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/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 ../../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 ../../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 ../../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 52a36db245..ae809e5892 100644
--- a/servers/slapd/back-ldbm/Make-template
+++ b/servers/slapd/back-ldbm/Make-template
@@ -69,63 +69,4 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-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/avl.h ../../../include/proto-lber.h
-index.o: ../../../include/proto-ldap.h ../../../include/ldif.h
-index.o: ../../../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 ../../../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 ../../../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 6283b10fe9..0de089de55 100644
--- a/servers/slapd/back-passwd/Make-template
+++ b/servers/slapd/back-passwd/Make-template
@@ -65,13 +65,4 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# 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 ../../../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 b72d05efe0..8179e1da5d 100644
--- a/servers/slapd/back-shell/Make-template
+++ b/servers/slapd/back-shell/Make-template
@@ -67,34 +67,4 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-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 ../../../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/shell-backends/Make-template b/servers/slapd/shell-backends/Make-template
index 473c30dacd..c4c1f36c49 100644
--- a/servers/slapd/shell-backends/Make-template
+++ b/servers/slapd/shell-backends/Make-template
@@ -60,7 +60,3 @@ depend: FORCE
links:
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index c7c83bc7d5..b4bd65f460 100644
--- a/servers/slapd/tools/Make-template
+++ b/servers/slapd/tools/Make-template
@@ -157,48 +157,17 @@ clean: FORCE
@echo "making clean in `$(PWD)`"
$(RM) edb2ldif ldif2index *.o core a.out edb2-vers.c \
ldif2ldbm ldif2id2entry ldif2id2children ldbmcat ldif \
- centipede chlog2replog sizecount ldif2ldbm.sed.c ldbmtest
+ centipede chlog2replog sizecount ldbmtest
-depend: ldif2ldbm.sed.c FORCE
+depend: FORCE
@if [ ! -z "$(HAVEISODE)" ]; then \
DEPENDEXTRAS="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \
fi; \
$(MKDEP) $(INCLUDES) $(DEFINES) $$DEPENDEXTRAS ldif2index.c \
ldif2ldbm.c ldif2id2entry.c ldif2id2children.c ldbmcat.c \
- centipede.c sizecount.c ldif2ldbm.sed.c ldbmtest.c ldif.c
+ centipede.c sizecount.c ldbmtest.c ldif.c
links:
@echo "making links in `$(PWD)`"
@$(LN) .src/*.[ch] .
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-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/slurpd/Make-template b/servers/slurpd/Make-template
index 6d57327b5c..c1136575e8 100644
--- a/servers/slurpd/Make-template
+++ b/servers/slurpd/Make-template
@@ -78,45 +78,3 @@ links:
@echo "making links in `$(PWD)`"
@$(LN) .src/*.[ch] .
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-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
--
GitLab