From 84bc7ef434b6b903eba45b7c4b08d9360bcd02f0 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sun, 29 Nov 1998 23:12:27 +0000 Subject: [PATCH] Import build environment changes from -devel including $ldap_subdir change and lib-shared fix. --- build/lib-shared.mk | 4 +- build/man.mk | 1 + build/top.mk | 17 ++--- clients/fax500/Makefile.in | 2 +- clients/finger/Makefile.in | 2 +- clients/gopher/Makefile.in | 6 +- clients/mail500/Makefile.in | 2 +- clients/rcpt500/Makefile.in | 6 +- clients/tools/Makefile.in | 2 +- clients/ud/Makefile.in | 2 +- configure.in | 11 ++++ doc/man/man3/ldap_friendly.3 | 11 +++- doc/man/man5/ldapfriendly.5 | 17 +++-- doc/man/man8/rcpt500.8 | 13 ++-- include/Makefile.in | 1 + include/ldapconfig.h.edit | 109 +++++++++++++++++++++----------- libraries/liblber/Makefile.in | 2 +- libraries/libldap/Makefile.in | 21 +++--- servers/ldapd/Makefile.in | 4 +- servers/slapd/Makefile.in | 25 +++++--- servers/slapd/tools/Makefile.in | 4 +- servers/slurpd/Makefile.in | 2 +- 22 files changed, 172 insertions(+), 92 deletions(-) diff --git a/build/lib-shared.mk b/build/lib-shared.mk index b0778be22d..57627f1645 100644 --- a/build/lib-shared.mk +++ b/build/lib-shared.mk @@ -14,7 +14,9 @@ MKDEPFLAG = -l $(LIBRARY): version.lo $(LINK) -rpath $(libdir) -o $@ $(OBJS) version.lo - @$(RM) ../$@; \ + $(RM) ../$@; \ (d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@) + $(RM) ../`$(BASENAME) $@ .la`.a; \ + (d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t) Makefile: $(top_srcdir)/build/lib-shared.mk diff --git a/build/man.mk b/build/man.mk index b5cc10b79a..3fd3bdfa99 100644 --- a/build/man.mk +++ b/build/man.mk @@ -13,6 +13,7 @@ install-common: FORCE $(SED) -e "s%LDVERSION%$$VERSION%" \ -e 's%ETCDIR%$(sysconfdir)%' \ -e 's%SYSCONFDIR%$(sysconfdir)%' \ + -e 's%DATADIR%$(datadir)%' \ -e 's%SBINDIR%$(sbindir)%' \ -e 's%BINDIR%$(bindir)%' \ -e 's%LIBDIR%$(libdir)%' \ diff --git a/build/top.mk b/build/top.mk index 8d9f785499..090db8ea8f 100644 --- a/build/top.mk +++ b/build/top.mk @@ -17,17 +17,18 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +ldap_subdir = @ldap_subdir@ bindir = @bindir@ -sbindir = @sbindir@ +datadir = @datadir@/$(ldap_subdir) +includedir = @includedir@ +infodir = @infodir@ +libdir = @libdir@ libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@/ldap -sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ mandir = @mandir@ -includedir = @includedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@/$(ldap_subdir) INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -58,7 +59,7 @@ HOSTNAME = uname -n BASENAME = basename PWD = pwd CAT = cat -MKDIR = mkdir +MKDIR = mkdir -p CHMOD = chmod # Misc UNIX commands used in programs diff --git a/clients/fax500/Makefile.in b/clients/fax500/Makefile.in index c55a9c238e..eee5f6b526 100644 --- a/clients/fax500/Makefile.in +++ b/clients/fax500/Makefile.in @@ -32,7 +32,7 @@ fax5version.c: ${FAX5OBJS} $(LDAP_LIBDEPEND) < $(srcdir)/Version.c > $@) install-local: $(PROGRAMS) xrpcomp FORCE - -$(MKDIR) -p $(libexecdir) + -$(MKDIR) $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 rp500 $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 fax500 $(libexecdir) $(SED) -e 's%LIBEXECDIR%$(libexecdir)%' $(srcdir)/xrpcomp > /tmp/xrpcomp.tmp diff --git a/clients/finger/Makefile.in b/clients/finger/Makefile.in index 066bba286c..32429851dc 100644 --- a/clients/finger/Makefile.in +++ b/clients/finger/Makefile.in @@ -18,5 +18,5 @@ version.c: ${OBJS} ${LDAP_LIBDEPEND} < $(srcdir)/Version.c > $@) install-local: $(PROGRAMS) FORCE - -$(MKDIR) -p $(libexecdir) + -$(MKDIR) $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(libexecdir) diff --git a/clients/gopher/Makefile.in b/clients/gopher/Makefile.in index 893c3a416e..7d487761b2 100644 --- a/clients/gopher/Makefile.in +++ b/clients/gopher/Makefile.in @@ -36,8 +36,8 @@ gwversion.c: ${GWOBJS} $(LDAP_LIBDEPEND) < $(srcdir)/Versiongw.c > $@) install-local: $(PROGRAMS) go500gw.help FORCE - -$(MKDIR) -p $(libexecdir) $(sysconfdir) + -$(MKDIR) $(libexecdir) $(datadir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500 $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 go500gw $(libexecdir) - -$(MV) $(sysconfdir)/go500gw.help $(sysconfdir)/go500gw.help- - $(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(sysconfdir) + -$(MV) $(datadir)/go500gw.help $(datadir)/go500gw.help- + $(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(datadir) diff --git a/clients/mail500/Makefile.in b/clients/mail500/Makefile.in index ae398df08f..0c5c2f4c27 100644 --- a/clients/mail500/Makefile.in +++ b/clients/mail500/Makefile.in @@ -19,5 +19,5 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND) < $(srcdir)/Version.c > $@) install-local: $(PROGRAMS) FORCE - -$(MKDIR) -p $(libexecdir) + -$(MKDIR) $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 mail500 $(libexecdir) diff --git a/clients/rcpt500/Makefile.in b/clients/rcpt500/Makefile.in index a7c946ed4e..541b8374ab 100644 --- a/clients/rcpt500/Makefile.in +++ b/clients/rcpt500/Makefile.in @@ -19,7 +19,7 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND) < $(srcdir)/Version.c > $@) install-local: $(PROGRAMS) rcpt500.help FORCE - -$(MKDIR) -p $(libexecdir) $(sysconfdir) + -$(MKDIR) $(libexecdir) $(datadir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(libexecdir) - -$(MV) $(sysconfdir)/rcpt500.help $(sysconfdir)/rcpt500.help- - $(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(sysconfdir) + -$(MV) $(datadir)/rcpt500.help $(datadir)/rcpt500.help- + $(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(datadir) diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in index d9c733069d..dc0a10e679 100644 --- a/clients/tools/Makefile.in +++ b/clients/tools/Makefile.in @@ -62,7 +62,7 @@ ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND) < $(srcdir)/Versionldr.c > $@) install-local: FORCE - -$(MKDIR) -p $(bindir) + -$(MKDIR) $(bindir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(bindir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(bindir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(bindir) diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in index f6dc3a518d..f1ec3b01b9 100644 --- a/clients/ud/Makefile.in +++ b/clients/ud/Makefile.in @@ -23,6 +23,6 @@ version.c: ${OBJS} $(LDAP_LIBDEPEND) < $(srcdir)/Version.c > $@) install-local: FORCE - -$(MKDIR) -p $(bindir) + -$(MKDIR) $(bindir) -mv -f $(bindir)/ud $(bindir)/ud- $(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir) diff --git a/configure.in b/configure.in index 0cb53b3d0c..801144931f 100644 --- a/configure.in +++ b/configure.in @@ -27,6 +27,17 @@ AC_PREFIX_DEFAULT(/usr/local) top_builddir=`pwd` AC_SUBST(top_builddir)dnl +ldap_subdir="openldap" +AC_SUBST(ldap_subdir)dnl + +AC_ARG_WITH(subdir, [ --with-subdir=DIR change default subdirectory used for installs], [ + if test "$withval" = "no"; then + ldap_subdir="" + elif test "$withval" != "yes"; then + ldap_subdir="$withval" + fi +])dnl + OL_ARG_ENABLE(debug,[ --enable-debug enable debugging], yes)dnl dnl OL_ARG_ENABLE(syslog,[ --enable-syslog enable syslog support], auto)dnl OL_ARG_ENABLE(proctitle,[ --enable-proctitle enable proctitle support], yes)dnl diff --git a/doc/man/man3/ldap_friendly.3 b/doc/man/man3/ldap_friendly.3 index 1cf254b475..ac3d8674f2 100644 --- a/doc/man/man3/ldap_friendly.3 +++ b/doc/man/man3/ldap_friendly.3 @@ -1,4 +1,4 @@ -.TH LDAP_FRIENDLY 3 "11 October 1993" "U-M LDAP LDVERSION" +.TH LDAP_FRIENDLY 3 "22 September 1998" "OpenLDAP LDVERSION" .SH NAME ldap_friendly_name, ldap_free_friendlymap \- LDAP unfriendly to friendly name mapping routine .SH SYNOPSIS @@ -43,7 +43,7 @@ For example: FriendlyMap *map = NULL; printf( "unfriendly %s => friendly %s\\n", name, - ldap_friendly_name( "ETCDIR/ldapfriendly", name, &map ) ); + ldap_friendly_name( "DATADIR/ldapfriendly", name, &map ) ); .ft .fi .LP @@ -63,6 +63,11 @@ NULL is returned by if there is an error opening \fIfilename\fP, or if the file has a bad format, or if the \fImap\fP parameter is NULL. .SH FILES -ETCDIR/ldapfriendly.conf +DATADIR/ldapfriendly.conf .SH SEE ALSO .BR ldap (3) +.SH ACKNOWLEDGEMENTS +.B OpenLDAP +is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). +.B OpenLDAP +is derived from University of Michigan LDAP 3.3 Release. diff --git a/doc/man/man5/ldapfriendly.5 b/doc/man/man5/ldapfriendly.5 index 088fd13560..a48442843d 100644 --- a/doc/man/man5/ldapfriendly.5 +++ b/doc/man/man5/ldapfriendly.5 @@ -1,16 +1,16 @@ -.TH LDAPFRIENDLY 5 "24 November 1994" "U-M LDAP LDVERSION" +.TH LDAPFRIENDLY 5 "22 September 1998" "OpenLDAP LDVERSION" .SH NAME -ldapfriendly \- configuration file for LDAP friendly routines +ldapfriendly \- data file for LDAP friendly routines .SH SYNOPSIS -ETCDIR/ldapfriendly +DATADIR/ldapfriendly .SH DESCRIPTION .LP -The file ETCDIR/ldapfriendly contains simple mapping information +The file DATADIR/ldapfriendly contains simple mapping information used by the .BR ldap_friendly_name (3) routine. Blank lines and lines that have a first character of `#' are treated as comments and -ignored. The configuration information consists of lines that contain +ignored. The information consists of lines that contain an "unfriendly" name, a tab, and a "friendly" name. .LP Other friendly mapping files can be created and used by @@ -20,7 +20,12 @@ above and include the file name in the .B ldap_friendly_name() call. .SH FILES -ETCDIR/ldapfriendly +DATADIR/ldapfriendly .SH SEE ALSO .BR ldap (3), .BR ldap_friendly_name (3) +.SH ACKNOWLEDGEMENTS +.B OpenLDAP +is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). +.B OpenLDAP +is derived from University of Michigan LDAP 3.3 Release. diff --git a/doc/man/man8/rcpt500.8 b/doc/man/man8/rcpt500.8 index 3131812bb8..62cd119317 100644 --- a/doc/man/man8/rcpt500.8 +++ b/doc/man/man8/rcpt500.8 @@ -1,8 +1,8 @@ -.TH RCPT500 8C "16 December 1994" "U-M LDAP LDVERSION" +.TH RCPT500 8C "22 September 1998" "OpenLDAP LDVERSION" .SH NAME rcpt500 \- mail to X.500 gateway program .SH SYNOPSIS -.B ETCDIR/rcpt500 [\-l] [\-h ldaphost] [\-p ldapport] +.B LIBEXECDIR/rcpt500 [\-l] [\-h ldaphost] [\-p ldapport] .B [\-b searchbase] [\-a] [\-U] [\-z sizelimit] [\-u dapuser] .B [\-f filterfile] [\-t templatefile] [\-c rdncount] .SH DESCRIPTION @@ -27,7 +27,7 @@ invoked whenever mail is sent to the address \fInamelookup\fP on your host: .nf .fi .ft tt - namelookup: "|ETCDIR/rcpt500 -l" + namelookup: "|LIBEXECDIR/rcpt500 -l" .ft .fi .SH OPTIONS @@ -77,10 +77,15 @@ for your site. .SH FILES .PD 0 .TP 20 -.B ETCDIR/rcpt500.help +.B DATADIR/rcpt500.help help file .PD .SH "SEE ALSO" .BR ldap (3), .BR aliases (5), .BR sendmail (8) +.SH ACKNOWLEDGEMENTS +.B OpenLDAP +is developed and maintained by The OpenLDAP Project (http://www.openldap.org/). +.B OpenLDAP +is derived from University of Michigan LDAP 3.3 Release. diff --git a/include/Makefile.in b/include/Makefile.in index a2de03e941..3c9f76a788 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -32,6 +32,7 @@ ldapconfig.h: $(srcdir)/ldapconfig.h.edit Makefile echo "" >> $@; \ $(SED) \ -e 's;%SYSCONFDIR%;$(sysconfdir);' \ + -e 's;%DATADIR%;$(datadir);' \ -e 's;%BINDIR%;$(bindir);' \ -e 's;%SBINDIR%;$(sbindir);' \ -e 's;%LIBEXECDIR%;$(libexecdir);' \ diff --git a/include/ldapconfig.h.edit b/include/ldapconfig.h.edit index 723bde2472..82d347822e 100644 --- a/include/ldapconfig.h.edit +++ b/include/ldapconfig.h.edit @@ -10,22 +10,41 @@ * is provided ``as is'' without express or implied warranty. */ -#ifndef _CONFIG_H -#define _CONFIG_H +#ifndef _LDAP_CONFIG_H +#define _LDAP_CONFIG_H /* * config.h for LDAP -- edit this file to customize LDAP client behavior. * NO platform-specific definitions should be placed in this file. - * Note that this is NOT used by the LDAP or LBER libraries. + * Note that this IS USED by the LDAP or LBER libraries. */ /* * SHARED DEFINITIONS - things you should change */ - /* default ldap host */ +#define DEFAULT_BINDIR "%BINDIR%" +#define DEFAULT_SBINDIR "%SBINDIR%" +#define DEFAULT_DATADIR "%DATADIR%" +#define DEFAULT_SYSCONFDIR "%SYSCONFDIR%" +#define DEFAULT_LIBEXECDIR "%LIBEXECDIR%" + +/* default ldap host */ #define LDAPHOST "localhost" - /* default place to start searching */ + +#define DEFAULT_LDAPHOST_FILE "%SYSCONFDIR%/ldaphost" +/* default place to start searching */ #define DEFAULT_BASE "o=Your Organization Name, c=US" +#define DEFAULT_BASE_FILE "%SYSCONFDIR%/ldapbase" + +/* + * default binddn and creditials + * use files, make sure they are not generally readable + */ +#define DEFAULT_BINDDN NULL +#define DEFAULT_BINDDN_FILE "%SYSCONFDIR%/ldapbinddn" + +#define DEFAULT_BIND_CRED NULL +#define DEFAULT_BIND_CRED_FILE "%SYSCONFDIR%/ldapbindcred" /********************************************************************* * * @@ -41,27 +60,28 @@ /* default count of DN components to show in entry displays */ #define DEFAULT_RDNCOUNT 2 /* default config file locations */ -#define FILTERFILE "%ETCDIR%/ldapfilter.conf" -#define TEMPLATEFILE "%ETCDIR%/ldaptemplates.conf" -#define SEARCHFILE "%ETCDIR%/ldapsearchprefs.conf" -#define FRIENDLYFILE "%ETCDIR%/ldapfriendly" +#define FILTERFILE "%SYSCONFDIR%/ldapfilter.conf" +#define TEMPLATEFILE "%SYSCONFDIR%/ldaptemplates.conf" +#define SEARCHFILE "%SYSCONFDIR%/ldapsearchprefs.conf" +#define FRIENDLYFILE "%DATADIR%/ldapfriendly" /* * 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." @@ -72,7 +92,7 @@ Please try again later.\r\n" /* max number of hits displayed in full before a list is presented */ #define FINGER_LISTLIMIT 1 /* what to exec for "finger @host" */ -#define FINGER_CMD "/usr/ucb/finger" +#define FINGER_CMD "%FINGER%" /* how to treat aliases when searching */ #define FINGER_DEREF LDAP_DEREF_FINDING /* attribute to use when sorting results */ @@ -89,6 +109,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 */ @@ -113,9 +134,10 @@ 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" +#define GO500GW_HELPFILE "%DATADIR%/go500gw.help" /* port on which to listen */ #define GO500GW_PORT 7777 /* timeout on all searches */ @@ -137,15 +159,16 @@ 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" +#define RCPT500_HELPFILE "%DATADIR%/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\" " +#define RCPT500_FROM "\"Directory Query Program\" " /* command that will accept an RFC822 message text on standard input, and send it. sendmail -t does this nicely. */ -#define RCPT500_PIPEMAILCMD "/usr/lib/sendmail -t" +#define RCPT500_PIPEMAILCMD "%SENDMAIL% -t" /* where to search */ #define RCPT500_BASE DEFAULT_BASE /* attribute to use when sorting results */ @@ -161,7 +184,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 @@ -169,7 +193,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 @@ -177,7 +202,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 @@ -185,7 +211,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 @@ -193,7 +220,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 ) */ @@ -201,23 +229,23 @@ Please try again later.\r\n" /* timeout for all searches */ #define MAIL500_TIMEOUT 180 /* sendmail location - mail500 needs to exec this */ -#define MAIL500_SENDMAIL "/usr/lib/sendmail" +#define MAIL500_SENDMAIL "%SENDMAIL%" /* * UD DEFINITIONS */ /* ud configuration file */ -#define UD_CONFIG_FILE "%ETCDIR%/ud.conf" +#define UD_CONFIG_FILE "%SYSCONFDIR%/ud.conf" /* default editor */ -#define UD_DEFAULT_EDITOR "/usr/ucb/vi" +#define UD_DEFAULT_EDITOR "%EDITOR%" /* default bbasename of user config file */ #define UD_USER_CONFIG_FILE ".udrc" /* 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 */ @@ -227,7 +255,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 */ @@ -235,13 +266,17 @@ Please try again later.\r\n" /* maximum number of members allowed */ #define FAX_MAXMEMBERS LDAP_NO_LIMIT /* program to send mail */ -#define FAX_SENDMAIL "/usr/lib/sendmail" +#define FAX_SENDMAIL "%SENDMAIL%" /* * 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 "" @@ -249,15 +284,17 @@ Please try again later.\r\n" * SLAPD DEFINITIONS */ /* location of the default slapd config file */ -#define SLAPD_DEFAULT_CONFIGFILE "%ETCDIR%/slapd.conf" +#define SLAPD_DEFAULT_CONFIGFILE "%SYSCONFDIR%/slapd.conf" + /* default max deref depth for aliases */ +#define SLAPD_DEFAULT_MAXDEREFDEPTH 15 /* default sizelimit on number of entries from a search */ #define SLAPD_DEFAULT_SIZELIMIT 500 /* default timelimit to spend on a search */ #define SLAPD_DEFAULT_TIMELIMIT 3600 /* location of the slapd pid file */ -#define SLAPD_PIDFILE "%ETCDIR%/slapd.pid" +#define SLAPD_PIDFILE "%RUNDIR%/slapd.pid" /* location of the slapd args file */ -#define SLAPD_ARGSFILE "%ETCDIR%/slapd.args" +#define SLAPD_ARGSFILE "%RUNDIR%/slapd.args" /* dn of the special "monitor" entry */ #define SLAPD_MONITOR_DN "cn=monitor" /* dn of the special "config" entry */ @@ -265,4 +302,4 @@ Please try again later.\r\n" /* minimum max ids that a single index entry can map to in ldbm */ #define SLAPD_LDBM_MIN_MAXIDS 4000 -#endif /* _CONFIG_H */ +#endif /* _LDAP_CONFIG_H */ diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in index 4051a24357..4d6754ee94 100644 --- a/libraries/liblber/Makefile.in +++ b/libraries/liblber/Makefile.in @@ -23,6 +23,6 @@ idtest: $(LIBRARY) idtest.o $(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS) install-local: FORCE - -$(MKDIR) -p $(libdir) + -$(MKDIR) $(libdir) $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir) diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in index 39f39cd60e..fd739a8a82 100644 --- a/libraries/libldap/Makefile.in +++ b/libraries/libldap/Makefile.in @@ -29,18 +29,23 @@ ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND) ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND) $(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS) -CFFILES= ldapfilter.conf ldapfriendly \ - ldaptemplates.conf ldapsearchprefs.conf +CFFILES=ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf install-local: $(CFFILES) FORCE - -$(MKDIR) -p $(libdir) + -$(MKDIR) $(libdir) $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir) - -$(MKDIR) -p $(sysconfdir) + -$(MKDIR) $(sysconfdir) @for i in $(CFFILES); do \ - echo "installing $$i in $(sysconfdir)"; \ - if test -f $(sysconfdir)/$$i; then \ - $(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i-; \ + if test ! -f $(sysconfdir)/$$i; then \ + echo "installing $$i in $(sysconfdir)"; \ + echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i"; \ + $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i; \ + else \ + echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \ fi; \ - $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir); \ + $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i.default; \ done + -$(MKDIR) $(datadir) + -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly- + $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(datadir)/ldapfriendly diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in index 3b0bff4b2d..cd683ae16e 100644 --- a/servers/ldapd/Makefile.in +++ b/servers/ldapd/Makefile.in @@ -45,6 +45,6 @@ LDAP_tables.c: ldap.py LDAP-types.h: LDAP_tables.c -install-local: FORCE - @$(MKDIR) -p $(libexecdir) +install-srv: FORCE + @$(MKDIR) $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LDAP_LIBEXECDIR) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 9aaa5c447a..adace7035d 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -116,16 +116,23 @@ install-slapd: FORCE @-$(MKDIR) $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd $(libexecdir) +CFFILES=slapd.conf slapd.at.conf slapd.oc.conf + install-conf: FORCE - @-$(MKDIR) -p $(sysconfdir) - $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' slapd.conf > /tmp/slapd.$$ - -$(MV) $(sysconfdir)/slapd.conf $(sysconfdir)/slapd.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(sysconfdir)/slapd.conf - $(RM) -f /tmp/slapd.$$ - -$(MV) $(sysconfdir)/slapd.at.conf $(sysconfdir)/slapd.at.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(sysconfdir) - -$(MV) $(sysconfdir)/slapd.oc.conf $(sysconfdir)/slapd.oc.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(sysconfdir) + @-$(MKDIR) $(sysconfdir) + @for i in $(CFFILES); do \ + tmpcf=/tmp/$$i.$$ ; \ + $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $$i > $$tmpcf ; \ + if test ! -f $(sysconfdir)/$$i; then \ + echo "installing $$i in $(sysconfdir)"; \ + echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i"; \ + $(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i; \ + else \ + echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \ + fi; \ + $(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i.default; \ + $(RM) -f /tmp/slapd.$$ ; \ + done install-tools: FORCE @-$(MKDIR) $(sbindir) diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in index 2f8619fd2b..2608b75472 100644 --- a/servers/slapd/tools/Makefile.in +++ b/servers/slapd/tools/Makefile.in @@ -128,7 +128,7 @@ depend-local: FORCE install-local: install-ldbm install-isode FORCE install-ldbm: FORCE - @-$(MKDIR) -p $(sbindir) + @-$(MKDIR) $(sbindir) @if [ "$(BUILD_LDBM)" = "yes" ]; then \ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(sbindir) ; \ $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(sbindir) ; \ @@ -143,7 +143,7 @@ install-ldbm: FORCE fi install-isode: FORCE - @-$(MKDIR) -p $(sbindir) + @-$(MKDIR) $(sbindir) @if [ "$(HAVE_ISODE)" = "yes" ]; then \ $(LTINSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \ $(LTINSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir); \ diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in index 11e0395a02..0c70980d14 100644 --- a/servers/slurpd/Makefile.in +++ b/servers/slurpd/Makefile.in @@ -41,5 +41,5 @@ version.c: $(OBJS) $(LDAP_LIBDEPEND) < $(srcdir)/Version.c > $@) install-local: FORCE - @-$(MKDIR) -p $(libexecdir) + @-$(MKDIR) $(libexecdir) $(LTINSTALL) $(INSTALLFLAGS) -m 755 slurpd $(libexecdir) -- 2.47.2