upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 07:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added LIBEXECDIR, SBINDIR and patched install rules and files as needed.

Browse source
This commit is contained in:
Kurt Zeilenga 1998-08-19 02:38:35 +00:00
parent 7df4daffcd
commit 079f21c3ac
32 changed files with 169 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Make-common
View file

@ -22,19 +22,23 @@
############################################################################# #############################################################################
# #
# by default, everything is installed below INSTROOT # by default, everything is installed below INSTROOT
# servers, config files, etc. are put in ETCDIR # config files, etc. are put in ETCDIR
# include files get put in INCLUDEDIR # include files get put in INCLUDEDIR
# libraries are put in LIBDIR # libraries are put in LIBDIR
# man pages are put under MANDIR # man pages are put under MANDIR
# programs end-users will run are put in BINDIR # programs end-users will run are put in BINDIR
# programs sysadmins will run are put in SBINDIR
# servers are put in LIBEXECDIR
# #
PREFIX?=/usr/local PREFIX?=/usr/local
INSTROOT=${PREFIX} INSTROOT?=${PREFIX}
ETCDIR= $(INSTROOT)/etc/ldap ETCDIR?= $(INSTROOT)/etc/ldap
INCLUDEDIR= $(INSTROOT)/include INCLUDEDIR?= $(INSTROOT)/include
LIBDIR= $(INSTROOT)/lib LIBDIR?= $(INSTROOT)/lib
MANDIR= $(INSTROOT)/man MANDIR?= $(INSTROOT)/man
BINDIR= $(INSTROOT)/bin BINDIR?= $(INSTROOT)/bin
SBINDIR?=$(INSTROOT)/sbin
LIBEXECDIR?=$(INSTROOT)/libexec
# #
# if you want things to run in a different directory from where they # if you want things to run in a different directory from where they
# are installed, set this accordingly (this path gets compiled into a # are installed, set this accordingly (this path gets compiled into a
@ -45,9 +49,9 @@ RUNTIMEETCDIR?= $(ETCDIR)
## General compiler options ## ## General compiler options ##
############################################################################# #############################################################################
# Passed to every compile (cc or gcc). This is where you put -O or -g, etc. # Passed to every compile (cc or gcc). This is where you put -O or -g, etc.
#EXTRACFLAGS=-O -g EXTRACFLAGS=-O -g
#EXTRACFLAGS=-O #EXTRACFLAGS=-O
EXTRACFLAGS=-g #EXTRACFLAGS=-g
# Passed to every link (ld). Include -g here if you did in EXTRACFLAGS. # Passed to every link (ld). Include -g here if you did in EXTRACFLAGS.
EXTRALDFLAGS=-g EXTRALDFLAGS=-g
@ -118,7 +122,7 @@ EXTRALDFLAGS=-g
MAKESLAPD= yes MAKESLAPD= yes
# #
# remove the defines for backends you don't want to enable # remove the defines for backends you don't want to enable
SLAPD_BACKENDS= -DLDAP_LDBM # -DLDAP_SHELL -DLDAP_PASSWD SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD
# #
# If you have included -DLDAP_LDBM in the SLAPD_BACKENDS line you need # If you have included -DLDAP_LDBM in the SLAPD_BACKENDS line you need
# to specify which low-level database package to use. There are # to specify which low-level database package to use. There are
@ -142,6 +146,7 @@ SLAPD_BACKENDS= -DLDAP_LDBM # -DLDAP_SHELL -DLDAP_PASSWD
LDBMBACKEND?=-DLDBM_USE_NDBM LDBMBACKEND?=-DLDBM_USE_NDBM
LDBMINCLUDE?= LDBMINCLUDE?=
LDBMLIB?= LDBMLIB?=
# if you want to use a non-default threads package change the defines below # if you want to use a non-default threads package change the defines below
# to one of: # to one of:
# -DPOSIX_THREADS (draft 10 or standard) # -DPOSIX_THREADS (draft 10 or standard)
@ -154,6 +159,13 @@ LDBMLIB?=
#THREADS?=-DNO_THREADS #THREADS?=-DNO_THREADS
#THREADSLIB?= #THREADSLIB?=
#
# Locations of auxilary programs
# (excepts to below are generally defined in Make-platform)
SENDMAIL?=/usr/lib/sendmail
EDITOR?=/usr/ucb/vi
FINGER?=/usr/ucb/finger
############################################################################# #############################################################################
## The following options are used by the xax500 client. If you haven't ## ## The following options are used by the xax500 client. If you haven't ##
## retrieved the xax500 source and dropped it into the "clients" ## ## retrieved the xax500 source and dropped it into the "clients" ##
@ -210,13 +222,15 @@ LDAP_DEBUG=-DLDAP_DEBUG
LDAP_REFERRALS=-DLDAP_REFERRALS LDAP_REFERRALS=-DLDAP_REFERRALS
# uncomment these lines to enable support for CRYPT passwords in LDBM. # uncomment these lines to enable support for CRYPT passwords in LDBM.
LDAP_CRYPT=-DLDAP_CRYPT # LDAP_CRYPT=-DLDAP_CRYPT
LDAP_CRYPT_LIB=-lcrypt # LDAP_CRYPT_LIB?=
# and comment this line out
LDAP_CRYPT_LIB=
# uncomment these lines to enable support fro tcp_wrappers in servers. # uncomment these lines to enable support fro tcp_wrappers in servers.
# Requires tcp_wrappers. # Requires tcp_wrappers.
LDAP_TCP_WRAPPERS=-DTCP_WRAPPERS -I/usr/local/include # LDAP_TCP_WRAPPERS=-DTCP_WRAPPERS -I/usr/local/include
LDAP_TCP_WRAPPERS_LIB=-L/usr/local/lib -lwrap # LDAP_TCP_WRAPPERS_LIB=-L/usr/local/lib -lwrap
# uncomment this line to use soundex for approximate matches in slapd. # uncomment this line to use soundex for approximate matches in slapd.
# the default is to use the metaphone algorithm. # the default is to use the metaphone algorithm.

10
build/platforms/freebsd-gcc/Make-platform
View file

@ -6,12 +6,14 @@
# #
# add any platform-specific overrides below here # add any platform-specific overrides below here
# #
PREFIX?=/usr/local EXTRACFLAGS=-O -g
INSTROOT=${PREFIX}
ETCDIR= $(INSTROOT)/etc/ldap
EXTRACFLAGS=-O
LDBMBACKEND=-DLDBM_USE_DBBTREE LDBMBACKEND=-DLDBM_USE_DBBTREE
LDBMINCLUDE=-I/usr/include LDBMINCLUDE=-I/usr/include
EDITOR=/usr/bin/vi
FINGER=/usr/bin/finger
SENDMAIL=/usr/sbin/sendmail
# #
# LDAP has a problem with the idea of implicit vs. explicit yields # LDAP has a problem with the idea of implicit vs. explicit yields
# in call conversion threading packages, like the MIT pthreads # in call conversion threading packages, like the MIT pthreads

6
clients/fax500/Make-template
View file

@ -54,11 +54,11 @@ fax5version.c: main.o faxtotpc.o $(LDIR)/libldap.a
install: rp500 xrpcomp fax500 FORCE install: rp500 xrpcomp fax500 FORCE
-$(MKDIR) -p $(ETCDIR) $(BINDIR) -$(MKDIR) -p $(ETCDIR) $(BINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(LIBEXECDIR)
$(SED) -e 's%ETCDIR%$(RUNTIMEETCDIR)%' xrpcomp > /tmp/xrpcomp.tmp $(SED) -e 's%ETCDIR%$(LIBEXECDIR)%' xrpcomp > /tmp/xrpcomp.tmp
$(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(BINDIR)/xrpcomp $(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(BINDIR)/xrpcomp
$(RM) /tmp/xrpcomp.tmp $(RM) /tmp/xrpcomp.tmp
$(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

2
clients/finger/Make-template
View file

@ -43,7 +43,7 @@ version.c: $(OBJS) $(LDIR)/libldap.a
install: in.xfingerd FORCE install: in.xfingerd FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(ETCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

4
clients/gopher/Make-template
View file

@ -57,8 +57,8 @@ gwversion.c: go500gw.o detach.o setproctitle.o $(DLIBS)
install: go500 go500gw go500gw.help FORCE install: go500 go500gw go500gw.help FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(ETCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 go500 $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 go500 $(LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 go500gw $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 go500gw $(LIBEXECDIR)
-$(MV) $(ETCDIR)/go500gw.help $(ETCDIR)/go500gw.help- -$(MV) $(ETCDIR)/go500gw.help $(ETCDIR)/go500gw.help-
$(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(ETCDIR)

2
clients/mail500/Make-template
View file

@ -42,7 +42,7 @@ version.c: $(OBJS) $(LDIR)/libldap/libldap.a
install: mail500 FORCE install: mail500 FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(ETCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 mail500 $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 mail500 $(LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

2
clients/rcpt500/Make-template
View file

@ -40,7 +40,7 @@ version.c: $(OBJS) $(LDIR)/libldap.a
install: rcpt500 rcpt500.help FORCE install: rcpt500 rcpt500.help FORCE
-$(MKDIR) -p $(ETCDIR) -$(MKDIR) -p $(ETCDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(ETCDIR)
lint: FORCE lint: FORCE

6
doc/man/man1/Make-template
View file

@ -25,7 +25,11 @@ install: FORCE
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$; \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e 's%ETCDIR%$(RUNTIMEETCDIR)%' -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \

6
doc/man/man3/Make-template
View file

@ -25,7 +25,11 @@ install: FORCE
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$; \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e 's%ETCDIR%$(RUNTIMEETCDIR)%' -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \

6
doc/man/man5/Make-template
View file

@ -25,7 +25,11 @@ install: FORCE
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$; \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e 's%ETCDIR%$(RUNTIMEETCDIR)%' -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \

6
doc/man/man8/Make-template
View file

@ -25,7 +25,11 @@ install: FORCE
@TMPMAN=/tmp/ldapman.$$$$; \ @TMPMAN=/tmp/ldapman.$$$$; \
VERSION=`$(CAT) $(VERSIONFILE)`; \ VERSION=`$(CAT) $(VERSIONFILE)`; \
for page in *.$(SECT); do \ for page in *.$(SECT); do \
$(SED) -e 's%ETCDIR%$(RUNTIMEETCDIR)%' -e "s%LDVERSION%$$VERSION%" \ $(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(RUNTIMEETCDIR)%' \
-e 's%SBINDIR%$(SBINDIR)%' \
-e 's%BINDIR%$(BINDIR)%' \
-e 's%LIBEXECDIR%$(LIBEXECDIR)%' \
$$page > $$TMPMAN; \ $$page > $$TMPMAN; \
echo "installing $(INSTDIR)/$$page"; \ echo "installing $(INSTDIR)/$$page"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \ $(INSTALL) $(INSTALLFLAGS) -m 644 $$TMPMAN $(INSTDIR)/$$page; \

6
doc/man/man8/centipede.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
centipede \- LDAP centroid index generation and maintenance program centipede \- LDAP centroid index generation and maintenance program
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/centipede .B SBINDIR/centipede
.B [\-f filter] .B [\-f filter]
.B [\-F] [\-R] .B [\-F] [\-R]
.B [\-f filter] [\-t directory] .B [\-f filter] [\-t directory]
@ -25,7 +25,7 @@ The basic form of the command is as follows
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/centipede [options] SBINDIR/centipede [options]
-s "ldap://[host/]subtree-to-index-dn" -s "ldap://[host/]subtree-to-index-dn"
-d "ldap://[host/]parent-of-index-entry-dn" -d "ldap://[host/]parent-of-index-entry-dn"
attributes attributes
@ -61,7 +61,7 @@ like this:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/centipede -f '(objectclass=person)' SBINDIR/centipede -f '(objectclass=person)'
-m simple -b your-rootdn -p your-rootdnpw -m simple -b your-rootdn -p your-rootdnpw
-s "ldap://babs.com/o=BabsCo, c=US" -s "ldap://babs.com/o=BabsCo, c=US"
-d "ldap://vertigo.rs.itd.umich.edu/c=US" -d "ldap://vertigo.rs.itd.umich.edu/c=US"

8
doc/man/man8/chlog2replog.8
View file

@ -3,7 +3,7 @@
chlog2replog \- convert an X.500 DSA-style changelog to an LDAP-style chlog2replog \- convert an X.500 DSA-style changelog to an LDAP-style
replication log replication log
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/chlog2replog .B SBINDIR/chlog2replog
.B \-r hostname:port [\-r hostname:port ...] .B \-r hostname:port [\-r hostname:port ...]
.B \-d dn\-suffix [\-o output\-file] < input\-file .B \-d dn\-suffix [\-o output\-file] < input\-file
.LP .LP
@ -64,7 +64,7 @@ DNs, and including a replica: entry for host "ldapserver," port
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/chlog2replog -d ", o=University of Michigan, c=US" SBINDIR/chlog2replog -d ", o=University of Michigan, c=US"
-r ldapserver:389 < changelog -r ldapserver:389 < changelog
.ft .ft
.fi .fi
@ -75,7 +75,7 @@ give this command:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/chlog2replog -d ", o=University of Michigan, c=US" SBINDIR/chlog2replog -d ", o=University of Michigan, c=US"
-r ldapserver:389 -o replog < changelog -r ldapserver:389 -o replog < changelog
.ft .ft
.fi .fi
@ -86,7 +86,7 @@ give this command:
.LP .LP
.nf .nf
.ft tt .ft tt
tail +0f changelog | ETCDIR/chlog2replog tail +0f changelog | SBINDIR/chlog2replog
-d ", o=University of Michigan, c=US" -d ", o=University of Michigan, c=US"
-r ldapserver:389 -o replog < changelog -r ldapserver:389 -o replog < changelog
.ft .ft

2
doc/man/man8/edb2ldif.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
edb2ldif \- QUIPU EDB file to LDIF conversion tool edb2ldif \- QUIPU EDB file to LDIF conversion tool
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/edb2ldif .B SBINDIR/edb2ldif
.B [\-d] [\-v] [\-r] [\-o] [\-b basedn] .B [\-d] [\-v] [\-r] [\-o] [\-b basedn]
.B [\-a addvalsfile] [\-f fileattrdir] .B [\-a addvalsfile] [\-f fileattrdir]
.B [\-i ignoreattr...] [edbfile...] .B [\-i ignoreattr...] [edbfile...]

10
doc/man/man8/go500.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
go500 \- Local Gopher index search to X.500 search gateway go500 \- Local Gopher index search to X.500 search gateway
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/go500 [\-b searchbase] [\-d level] [\-l] .B LIBEXECDIR/go500 [\-b searchbase] [\-d level] [\-l]
.B [\-x hostname] [\-c rdncount] [\-f filterfile] .B [\-x hostname] [\-c rdncount] [\-f filterfile]
.B [\-t templatefile] .B [\-t templatefile]
.B [\-p port] [\-I] .B [\-p port] [\-I]
@ -27,7 +27,7 @@ as a stand-alone server, simply start it with no arguments
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/go500 LIBEXECDIR/go500
.ft .ft
.fi .fi
.LP .LP
@ -38,8 +38,8 @@ or equivalent file:
.LP .LP
.nf .nf
.ft tt .ft tt
if [ -f ETCDIR/go500 ]; then if [ -f LIBEXECDIR/go500 ]; then
ETCDIR/go500; echo ' go500' LIBEXECDIR/go500; echo ' go500'
fi fi
.ft .ft
.fi .fi
@ -65,7 +65,7 @@ file, or the equivalent:
.LP .LP
.nf .nf
.ft tt .ft tt
go500 stream tcp nowait nobody ETCDIR/go500 go500 -I go500 stream tcp nowait nobody LIBEXECDIR/go500 go500 -I
.ft .ft
.fi .fi
.LP .LP

10
doc/man/man8/go500gw.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
go500gw \- General Gopher to X.500 gateway for browsing and searching go500gw \- General Gopher to X.500 gateway for browsing and searching
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/go500gw [\-a] [\-d level] [\-f filterfile] .B LIBEXECDIR/go500gw [\-a] [\-d level] [\-f filterfile]
.B [\-t templatefile] [\-c rdncount] .B [\-t templatefile] [\-c rdncount]
.B [\-h helpfile] [\-l] [\-p listenport] .B [\-h helpfile] [\-l] [\-p listenport]
.B [\-P ldapport] [\-x ldaphost] [\-I] .B [\-P ldapport] [\-x ldaphost] [\-I]
@ -27,7 +27,7 @@ as a stand-alone server, simply start it with no arguments
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/go500gw LIBEXECDIR/go500gw
.ft .ft
.fi .fi
.LP .LP
@ -38,8 +38,8 @@ or equivalent file:
.LP .LP
.nf .nf
.ft tt .ft tt
if [ -f ETCDIR/go500gw ]; then if [ -f LIBEXECDIR/go500gw ]; then
ETCDIR/go500gw; echo ' go500gw' LIBEXECDIR/go500gw; echo ' go500gw'
fi fi
.ft .ft
.fi .fi
@ -64,7 +64,7 @@ file, or the equivalent:
.LP .LP
.nf .nf
.ft tt .ft tt
go500gw stream tcp nowait nobody ETCDIR/go500gw go500gw -I go500gw stream tcp nowait nobody LIBEXECDIR/go500gw go500gw -I
.ft .ft
.fi .fi
.LP .LP

4
doc/man/man8/in.xfingerd.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
in.xfingerd \- Finger to LDAP/X.500 gateway daemon in.xfingerd \- Finger to LDAP/X.500 gateway daemon
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/in.xfingerd [\-f filterfile] [\-i] .B LIBEXECDIR/in.xfingerd [\-f filterfile] [\-i]
.B [\-l] [\-t templatefile] [\-c rdncount] [\-x hostname] .B [\-l] [\-t templatefile] [\-c rdncount] [\-x hostname]
.B [\-p port] .B [\-p port]
.SH DESCRIPTION .SH DESCRIPTION
@ -22,7 +22,7 @@ file, or the equivalent:
.LP .LP
.nf .nf
.ft tt .ft tt
finger stream tcp nowait nobody ETCDIR/in.xfingerd in.xfingerd finger stream tcp nowait nobody LIBEXECDIR/in.xfingerd in.xfingerd
.ft .ft
.fi .fi
.LP .LP

6
doc/man/man8/ldapd.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
ldapd \- LDAP X.500 Protocol Daemon ldapd \- LDAP X.500 Protocol Daemon
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/ldapd [\-d level] [\-l] [\-c dsaname] .B LIBEXECDIR/ldapd [\-d level] [\-l] [\-c dsaname]
.B [\-p port] [\-t timeout] [\-r referraltimeout] .B [\-p port] [\-t timeout] [\-r referraltimeout]
.B [\-I] [\-U] .B [\-I] [\-U]
.SH DESCRIPTION .SH DESCRIPTION
@ -103,7 +103,7 @@ to the first DSA listed in the dsaptailor file, just type:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/ldapd LIBEXECDIR/ldapd
.ft .ft
.fi .fi
.LP .LP
@ -112,7 +112,7 @@ will be printed on standard error, type:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/ldapd -c dsanameoraddr -d 31 LIBEXECDIR/ldapd -c dsanameoraddr -d 31
.ft .ft
.fi .fi
.LP .LP

8
doc/man/man8/ldbmcat.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
ldbmcat \- LDBM to LDIF database format conversion utility ldbmcat \- LDBM to LDIF database format conversion utility
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/ldbmcat [\-n] id2entry\-file .B SBINDIR/ldbmcat [\-n] id2entry\-file
.LP .LP
.SH DESCRIPTION .SH DESCRIPTION
.LP .LP
@ -33,7 +33,7 @@ give the command:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/ldbmcat -n id2entry.dbb > ldif SBINDIR/ldbmcat -n id2entry.dbb > ldif
.ft .ft
.fi .fi
.LP .LP
@ -43,8 +43,8 @@ attribute, give these commands:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/ldbmcat id2entry.dbb > ldif SBINDIR/ldbmcat id2entry.dbb > ldif
ETCDIR/ldif2index -i ldif -f slapd-config-file mail SBINDIR/ldif2index -i ldif -f slapd-config-file mail
.ft .ft
.fi .fi
.LP .LP

2
doc/man/man8/ldif.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
ldif \- convert arbitrary data to LDIF format ldif \- convert arbitrary data to LDIF format
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/ldif [\-b] attr\-name .B SBINDIR/ldif [\-b] attr\-name
.LP .LP
.SH DESCRIPTION .SH DESCRIPTION
.LP .LP

14
doc/man/man8/ldif2ldbm.8
View file

@ -2,21 +2,21 @@
.SH NAME .SH NAME
ldif2ldbm, ldif2index, ldif2id2entry, ldif2id2children \- LDIF to LDBM database format conversion utilities ldif2ldbm, ldif2index, ldif2id2entry, ldif2id2children \- LDIF to LDBM database format conversion utilities
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/ldif2ldbm .B SBINDIR/ldif2ldbm
.B \-i ldif\-input\-file .B \-i ldif\-input\-file
.B [\-d debug\-level] [\-f slapd\-config\-file] .B [\-d debug\-level] [\-f slapd\-config\-file]
.B [\-j number\-of\-jobs] .B [\-j number\-of\-jobs]
.LP .LP
.B ETCDIR/ldif2index .B SBINDIR/ldif2index
.B \-i ldif\-input\-file .B \-i ldif\-input\-file
.B [\-d debug\-level] [\-f slapd\-config\-file] .B [\-d debug\-level] [\-f slapd\-config\-file]
.B attribute\-name .B attribute\-name
.LP .LP
.B ETCDIR/ldif2id2entry .B SBINDIR/ldif2id2entry
.B \-i ldif\-input\-file .B \-i ldif\-input\-file
.B [\-d debug\-level] [\-f slapd\-config\-file] .B [\-d debug\-level] [\-f slapd\-config\-file]
.LP .LP
.B ETCDIR/ldif2id2children .B SBINDIR/ldif2id2children
.B \-i ldif\-input\-file .B \-i ldif\-input\-file
.B [\-d debug\-level] [\-f slapd\-config\-file] .B [\-d debug\-level] [\-f slapd\-config\-file]
.LP .LP
@ -85,12 +85,12 @@ To convert the file
into an LDBM database with indexes as described in the into an LDBM database with indexes as described in the
.I slapd .I slapd
config file config file
.BR /usr/local/etc/slapd.conf , .BR ETCDIR/slapd.conf ,
give the command: give the command:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/ldif2index -i ldif.input -f /usr/local/etc/slapd.conf SBINDIR/ldif2index -i ldif.input -f ETCDIR/slapd.conf
.ft .ft
.fi .fi
.LP .LP
@ -99,7 +99,7 @@ give this command:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/ldif2index -i ldif.input -f /usr/local/etc/slapd.conf -j 2 SBINDIR/ldif2index -i ldif.input -f ETCDIR/slapd.conf -j 2
.ft .ft
.fi .fi
.LP .LP

8
doc/man/man8/mail500.8
View file

@ -4,11 +4,11 @@ mail500 \- X.500 capable mailer
.LP .LP
fax500 \- X.500 capable fax delivery agent fax500 \- X.500 capable fax delivery agent
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/mail500 [\-d level] [\-f mailfrom] .B LIBEXECDIR/mail500 [\-d level] [\-f mailfrom]
.B [\-h hostname] [\-l ldaphost] .B [\-h hostname] [\-l ldaphost]
.B [\-m address] [\-v vacationhost] .B [\-m address] [\-v vacationhost]
.LP .LP
.B ETCDIR/fax500 [\-d level] [\-f mailfrom] .B LIBEXECDIR/fax500 [\-d level] [\-f mailfrom]
.B [\-h hostname] [\-l ldaphost] .B [\-h hostname] [\-l ldaphost]
.B [\-m address] .B [\-m address]
.SH DESCRIPTION .SH DESCRIPTION
@ -253,8 +253,8 @@ The mail500 and fax500 mailers should be defined similar to this in the
sendmail.cf file: sendmail.cf file:
.LP .LP
.nf .nf
Mmail500, P=ETCDIR/mail500, F=DFMSmnXuh, A=mail500 -f $f -h $h -m $n@$w $u Mmail500, P=LIBEXECDIR/mail500, F=DFMSmnXuh, A=mail500 -f $f -h $h -m $n@$w $u
Mfax500, P=ETCDIR/fax500, F=DFMSmnXuh, A=fax500 -f $f -h $h -m $n@$w $u Mfax500, P=LIBEXECDIR/fax500, F=DFMSmnXuh, A=fax500 -f $f -h $h -m $n@$w $u
.fi .fi
.LP .LP
This defines how mail500/fax500 will be treated by sendmail and what This defines how mail500/fax500 will be treated by sendmail and what

4
doc/man/man8/rcpt500.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
rcpt500 \- mail to X.500 gateway program rcpt500 \- mail to X.500 gateway program
.SH SYNOPSIS .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 [\-b searchbase] [\-a] [\-U] [\-z sizelimit] [\-u dapuser]
.B [\-f filterfile] [\-t templatefile] [\-c rdncount] .B [\-f filterfile] [\-t templatefile] [\-c rdncount]
.SH DESCRIPTION .SH DESCRIPTION
@ -27,7 +27,7 @@ invoked whenever mail is sent to the address \fInamelookup\fP on your host:
.nf .nf
.fi .fi
.ft tt .ft tt
namelookup: "|ETCDIR/rcpt500 -l" namelookup: "|LIBEXECDIR/rcpt500 -l"
.ft .ft
.fi .fi
.SH OPTIONS .SH OPTIONS

4
doc/man/man8/slapd.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
slapd \- Stand-alone LDAP Daemon slapd \- Stand-alone LDAP Daemon
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/slapd [\-d debug\-level] .B LIBEXECDIR/slapd [\-d debug\-level]
.B [\-f slapd\-config\-file] [\-p port\-number] .B [\-f slapd\-config\-file] [\-p port\-number]
.B [\-s syslog\-level] [\-i] .B [\-s syslog\-level] [\-i]
.B .B
@ -89,7 +89,7 @@ on voluminous debugging which will be printed on standard error, type:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/slapd -f /usr/local/slapd/slapd.conf -d 255 LIBEXECDIR/slapd -f ETCDIR/slapd.conf -d 255
.ft .ft
.fi .fi
.LP .LP

6
doc/man/man8/slurpd.8
View file

@ -2,7 +2,7 @@
.SH NAME .SH NAME
slurpd \- Standalone LDAP Update Replication Daemon slurpd \- Standalone LDAP Update Replication Daemon
.SH SYNOPSIS .SH SYNOPSIS
.B ETCDIR/slurpd [\-d debug\-level] .B LIBEXECDIR/slurpd [\-d debug\-level]
.B [\-f slapd\-config\-file] [\-r slapd\-replog\-file] .B [\-f slapd\-config\-file] [\-r slapd\-replog\-file]
.B [\-t temp\-dir] [\-o] [\-k srvtab\-file] .B [\-t temp\-dir] [\-o] [\-k srvtab\-file]
.B .B
@ -126,7 +126,7 @@ just type:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/slurpd LIBEXECDIR/slurpd
.ft .ft
.fi .fi
.LP .LP
@ -139,7 +139,7 @@ on voluminous debugging which will be printed on standard error, type:
.LP .LP
.nf .nf
.ft tt .ft tt
ETCDIR/slurpd -f /usr/local/etc/slapd.conf -d 255 LIBEXECDIR/slurpd -f ETCDIR/slapd.conf -d 255
.ft .ft
.fi .fi
.LP .LP

8
include/Make-template
View file

@ -31,7 +31,13 @@ ldapconfig.h: ldapconfig.h.edit Makefile
echo " * INSTALL file for more information." >> $@; \ echo " * INSTALL file for more information." >> $@; \
echo " */ " >> $@; \ echo " */ " >> $@; \
echo "" >> $@; \ echo "" >> $@; \
$(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' ldapconfig.h.edit >> $@; \ $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' \
-e 's;%SBINDIR%;$(SBINDIR);' \
-e 's;%LIBEXECDIR%;$(LIBEXECDIR);' \
-e 's;%EDITOR%;$(EDITOR);' \
-e 's;%FINGER%;$(FINGER);' \
-e 's;%SENDMAIL%;$(SENDMAIL);' \
ldapconfig.h.edit >> $@; \
$(CHMOD) 444 $@ $(CHMOD) 444 $@
install: all FORCE install: all FORCE

10
include/ldapconfig.h.edit
View file

@ -72,7 +72,7 @@ Please try again later.\r\n"
/* max number of hits displayed in full before a list is presented */ /* max number of hits displayed in full before a list is presented */
#define FINGER_LISTLIMIT 1 #define FINGER_LISTLIMIT 1
/* what to exec for "finger @host" */ /* what to exec for "finger @host" */
#define FINGER_CMD "/usr/ucb/finger" #define FINGER_CMD "%FINGER%"
/* how to treat aliases when searching */ /* how to treat aliases when searching */
#define FINGER_DEREF LDAP_DEREF_FINDING #define FINGER_DEREF LDAP_DEREF_FINDING
/* attribute to use when sorting results */ /* attribute to use when sorting results */
@ -145,7 +145,7 @@ Please try again later.\r\n"
#define RCPT500_FROM "\"X.500 Query Program\" <X500-Query>" #define RCPT500_FROM "\"X.500 Query Program\" <X500-Query>"
/* command that will accept an RFC822 message text on standard /* command that will accept an RFC822 message text on standard
input, and send it. sendmail -t does this nicely. */ input, and send it. sendmail -t does this nicely. */
#define RCPT500_PIPEMAILCMD "/usr/lib/sendmail -t" #define RCPT500_PIPEMAILCMD "%SENDMAIL% -t"
/* where to search */ /* where to search */
#define RCPT500_BASE DEFAULT_BASE #define RCPT500_BASE DEFAULT_BASE
/* attribute to use when sorting results */ /* attribute to use when sorting results */
@ -201,7 +201,7 @@ Please try again later.\r\n"
/* timeout for all searches */ /* timeout for all searches */
#define MAIL500_TIMEOUT 180 #define MAIL500_TIMEOUT 180
/* sendmail location - mail500 needs to exec this */ /* sendmail location - mail500 needs to exec this */
#define MAIL500_SENDMAIL "/usr/lib/sendmail" #define MAIL500_SENDMAIL "%SENDMAIL%"
/* /*
* UD DEFINITIONS * UD DEFINITIONS
@ -209,7 +209,7 @@ Please try again later.\r\n"
/* ud configuration file */ /* ud configuration file */
#define UD_CONFIG_FILE "%ETCDIR%/ud.conf" #define UD_CONFIG_FILE "%ETCDIR%/ud.conf"
/* default editor */ /* default editor */
#define UD_DEFAULT_EDITOR "/usr/ucb/vi" #define UD_DEFAULT_EDITOR "%EDITOR%"
/* default bbasename of user config file */ /* default bbasename of user config file */
#define UD_USER_CONFIG_FILE ".udrc" #define UD_USER_CONFIG_FILE ".udrc"
/* default user to bind as */ /* default user to bind as */
@ -235,7 +235,7 @@ Please try again later.\r\n"
/* maximum number of members allowed */ /* maximum number of members allowed */
#define FAX_MAXMEMBERS LDAP_NO_LIMIT #define FAX_MAXMEMBERS LDAP_NO_LIMIT
/* program to send mail */ /* program to send mail */
#define FAX_SENDMAIL "/usr/lib/sendmail" #define FAX_SENDMAIL "%SENDMAIL%"
/* /*
* RP500 DEFINITIONS * RP500 DEFINITIONS

6
servers/ldapd/Make-template
View file

@ -71,10 +71,10 @@ install: FORCE
echo "uncomment the HAVEISODE=yes line in the Make-common file to build and install ldapd"; \ echo "uncomment the HAVEISODE=yes line in the Make-common file to build and install ldapd"; \
fi fi
install-ldapd: $(ETCDIR) $(ETCDIR)/ldapd install-ldapd: $(LIBEXECDIR) $(LIBEXECDIR)/ldapd
$(ETCDIR)/ldapd: ldapd $(LIBEXECDIR)/ldapd: ldapd
$(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

7
servers/slapd/Make-template
View file

@ -100,12 +100,13 @@ version.c: libbackends.a $(OBJS) $(LDIR)/liblber/liblber.a \
-e "s|%VERSION%|$${v}|" \ -e "s|%VERSION%|$${v}|" \
< Version.c > $@) < Version.c > $@)
install: all $(ETCDIR) $(ETCDIR)/slapd $(ETCDIR)/slapd.conf \ install: all $(LIBEXECDIR) $(LIBEXECDIR)/slapd \
$(ETCDIR) $(ETCDIR)/slapd.conf \
$(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.oc.conf \ $(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.oc.conf \
install-tools install-tools
$(ETCDIR)/slapd: slapd $(LIBEXECDIR)/slapd: slapd
$(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(LIBEXECDIR)
$(ETCDIR)/slapd.conf: slapd.conf $(ETCDIR)/slapd.conf: slapd.conf
$(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' slapd.conf > /tmp/slapd.$$ $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' slapd.conf > /tmp/slapd.$$

54
servers/slapd/tools/Make-template
View file

@ -78,7 +78,9 @@ ldif2ldbm: ldif2ldbm.sed.o ../libbackends.a $(OBJS2)
../libbackends.a $(LDFLAGS) $(LIBS2) ../libbackends.a $(LDFLAGS) $(LIBS2)
ldif2ldbm.sed.c: ldif2ldbm.c ldif2ldbm.sed.c: ldif2ldbm.c
$(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' ldif2ldbm.c > ldif2ldbm.sed.c $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' \
-e 's;%SBINDIR%;$(SBINDIR);' \
ldif2ldbm.c > ldif2ldbm.sed.c
ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2) ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2)
$(CC) $(ALDFLAGS) -o $@ ldif2id2entry.o $(OBJS2) \ $(CC) $(ALDFLAGS) -o $@ ldif2id2entry.o $(OBJS2) \
@ -106,49 +108,49 @@ ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2)
$(CC) $(ALDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) \ $(CC) $(ALDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) \
../libbackends.a $(LDFLAGS) $(LIBS2) ../libbackends.a $(LDFLAGS) $(LIBS2)
install: $(ETCDIR) $(ETCDIR)/edb2ldif $(ETCDIR)/ldif2ldbm \ install: $(SBINDIR) $(SBINDIR)/edb2ldif $(SBINDIR)/ldif2ldbm \
$(ETCDIR)/ldif2index $(ETCDIR)/ldif2id2entry \ $(SBINDIR)/ldif2index $(SBINDIR)/ldif2id2entry \
$(ETCDIR)/ldif2id2children $(ETCDIR)/ldbmcat \ $(SBINDIR)/ldif2id2children $(SBINDIR)/ldbmcat \
$(ETCDIR)/centipede $(ETCDIR)/ldbmtest \ $(SBINDIR)/centipede $(SBINDIR)/ldbmtest \
$(ETCDIR)/ldif $(SBINDIR)/ldif
$(ETCDIR)/edb2ldif: build-edb2ldif $(SBINDIR)/edb2ldif: build-edb2ldif
@if [ "$(HAVEISODE)" = "yes" ]; then \ @if [ "$(HAVEISODE)" = "yes" ]; then \
$(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(ETCDIR); \ $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(SBINDIR); \
else \ else \
exit 0; \ exit 0; \
fi fi
$(ETCDIR)/chlog2replog: build-chlog2replog $(SBINDIR)/chlog2replog: build-chlog2replog
@if [ "$(HAVEISODE)" = "yes" ]; then \ @if [ "$(HAVEISODE)" = "yes" ]; then \
$(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(ETCDIR); \ $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(SBINDIR); \
else \ else \
exit 0; \ exit 0; \
fi fi
$(ETCDIR)/ldif2ldbm: ldif2ldbm $(SBINDIR)/ldif2ldbm: ldif2ldbm
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(SBINDIR)
$(ETCDIR)/ldif2index: ldif2index $(SBINDIR)/ldif2index: ldif2index
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(SBINDIR)
$(ETCDIR)/ldif2id2entry: ldif2id2entry $(SBINDIR)/ldif2id2entry: ldif2id2entry
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(SBINDIR)
$(ETCDIR)/ldif2id2children: ldif2id2children $(SBINDIR)/ldif2id2children: ldif2id2children
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(SBINDIR)
$(ETCDIR)/ldbmcat: ldbmcat $(SBINDIR)/ldbmcat: ldbmcat
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(SBINDIR)
$(ETCDIR)/ldif: ldif $(SBINDIR)/ldif: ldif
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(SBINDIR)
$(ETCDIR)/centipede: centipede $(SBINDIR)/centipede: centipede
$(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(SBINDIR)
$(ETCDIR)/ldbmtest: ldbmtest $(SBINDIR)/ldbmtest: ldbmtest
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(SBINDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)

21
servers/slapd/tools/ldif2ldbm.c
View file

@ -7,7 +7,7 @@
#include "../back-ldbm/back-ldbm.h" #include "../back-ldbm/back-ldbm.h"
#define DEFAULT_CONFIGFILE "%ETCDIR%/slapd.conf" #define DEFAULT_CONFIGFILE "%ETCDIR%/slapd.conf"
#define DEFAULT_ETCDIR "%ETCDIR%" #define DEFAULT_SBINDIR "%SBINDIR%"
#define INDEXCMD "ldif2index" #define INDEXCMD "ldif2index"
#define ID2ENTRYCMD "ldif2id2entry" #define ID2ENTRYCMD "ldif2id2entry"
#define ID2CHILDRENCMD "ldif2id2children" #define ID2CHILDRENCMD "ldif2id2children"
@ -52,14 +52,14 @@ static int nkids;
static void static void
usage( char *name ) usage( char *name )
{ {
fprintf( stderr, "usage: %s -i inputfile [-d debuglevel] [-f configfile] [-j #jobs] [-n databasenumber] [-e etcdir]\n", name ); fprintf( stderr, "usage: %s -i inputfile [-d debuglevel] [-f configfile] [-j #jobs] [-n databasenumber] [-s sbindir]\n", name );
exit( 1 ); exit( 1 );
} }
main( int argc, char **argv ) main( int argc, char **argv )
{ {
int i, stop, status; int i, stop, status;
char *linep, *buf, *etcdir; char *linep, *buf, *sbindir;
char *args[10]; char *args[10];
char buf2[20], buf3[20]; char buf2[20], buf3[20];
char line[BUFSIZ]; char line[BUFSIZ];
@ -74,17 +74,18 @@ main( int argc, char **argv )
Avlnode *avltypes = NULL; Avlnode *avltypes = NULL;
extern char *optarg; extern char *optarg;
etcdir = DEFAULT_ETCDIR; sbindir = DEFAULT_SBINDIR;
tailorfile = DEFAULT_CONFIGFILE; tailorfile = DEFAULT_CONFIGFILE;
dbnum = -1; dbnum = -1;
while ( (i = getopt( argc, argv, "d:e:f:i:j:n:" )) != EOF ) { while ( (i = getopt( argc, argv, "d:e:s:f:i:j:n:" )) != EOF ) {
switch ( i ) { switch ( i ) {
case 'd': /* turn on debugging */ case 'd': /* turn on debugging */
ldap_debug = atoi( optarg ); ldap_debug = atoi( optarg );
break; break;
case 'e': /* alternate etcdir (index cmd location) */ case 's': /* alternate sbindir (index cmd location) */
etcdir = strdup( optarg ); case 'e': /* accept -e for backwards compatibility */
sbindir = strdup( optarg );
break; break;
case 'f': /* specify a tailor file */ case 'f': /* specify a tailor file */
@ -150,7 +151,7 @@ main( int argc, char **argv )
*/ */
i = 0; i = 0;
sprintf( cmd, "%s/%s", etcdir, ID2ENTRYCMD ); sprintf( cmd, "%s/%s", sbindir, ID2ENTRYCMD );
args[i++] = cmd; args[i++] = cmd;
args[i++] = "-i"; args[i++] = "-i";
args[i++] = inputfile; args[i++] = inputfile;
@ -172,7 +173,7 @@ main( int argc, char **argv )
*/ */
i = 0; i = 0;
sprintf( cmd, "%s/%s", etcdir, ID2CHILDRENCMD ); sprintf( cmd, "%s/%s", sbindir, ID2CHILDRENCMD );
args[i++] = cmd; args[i++] = cmd;
args[i++] = "-i"; args[i++] = "-i";
args[i++] = inputfile; args[i++] = inputfile;
@ -194,7 +195,7 @@ main( int argc, char **argv )
*/ */
i = 0; i = 0;
sprintf( cmd, "%s/%s", etcdir, INDEXCMD ); sprintf( cmd, "%s/%s", sbindir, INDEXCMD );
args[i++] = cmd; args[i++] = cmd;
args[i++] = "-i"; args[i++] = "-i";
args[i++] = inputfile; args[i++] = inputfile;

6
servers/slurpd/Make-template
View file

@ -56,10 +56,10 @@ version.c: $(OBJS) $(LDIR)/liblber/liblber.a $(LDIR)/libldap/libldap.a
-e "s|%VERSION%|$${v}|" \ -e "s|%VERSION%|$${v}|" \
< Version.c > $@) < Version.c > $@)
install: $(ETCDIR) $(ETCDIR)/slurpd install: $(LIBEXECDIR) $(LIBEXECDIR)/slurpd
$(ETCDIR)/slurpd: slurpd $(LIBEXECDIR)/slurpd: slurpd
$(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(ETCDIR) $(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(LIBEXECDIR)
lint: FORCE lint: FORCE
$(LINT) $(INCLUDES) $(DEFINES) $(SRCS) $(LINT) $(INCLUDES) $(DEFINES) $(SRCS)