Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nadezhda Ivanova
OpenLDAP
Commits
ac989f10
Commit
ac989f10
authored
Sep 12, 1998
by
Kurt Zeilenga
Browse files
Directory rule is didn't work... use brute force
parent
58a295d8
Changes
4
Hide whitespace changes
Inline
Side-by-side
servers/slapd/Make-template
View file @
ac989f10
...
...
@@ -106,20 +106,25 @@ install: all $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slapd \
$(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.oc.conf \
install-tools
$(LDAP_LIBEXECDIR)/slapd: slapd
@$(MKDIR) $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(LDAP_LIBEXECDIR)
$(LDAP_ETCDIR)/slapd.conf: slapd.conf
@-$(MKDIR) $(LDAP_ETCDIR)
$(SED) -e 's;%ETCDIR%;$(LDAP_ETCDIR);' slapd.conf > /tmp/slapd.$$
-$(MV) $(LDAP_ETCDIR)/slapd.conf $(LDAP_ETCDIR)/slapd.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(LDAP_ETCDIR)/slapd.conf
$(RM) -f /tmp/slapd.$$
$(LDAP_ETCDIR)/slapd.at.conf: slapd.at.conf
@-$(MKDIR) $(LDAP_ETCDIR)
-$(MV) $(LDAP_ETCDIR)/slapd.at.conf $(LDAP_ETCDIR)/slapd.at.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(LDAP_ETCDIR)
$(LDAP_ETCDIR)/slapd.oc.conf: slapd.oc.conf
@-$(MKDIR) $(LDAP_ETCDIR)
-$(MV) $(LDAP_ETCDIR)/slapd.oc.conf $(LDAP_ETCDIR)/slapd.oc.conf-
$(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(LDAP_ETCDIR)
...
...
servers/slapd/acl.c
View file @
ac989f10
...
...
@@ -558,9 +558,9 @@ regex_matches(
rc
=
regexec
(
&
re
,
str
,
0
,
NULL
,
0
);
regfree
(
&
re
);
Debug
(
LDAP_DEBUG_
ANY
,
Debug
(
LDAP_DEBUG_
TRACE
,
"=> regex_matches: string: %s
\n
"
,
str
,
0
,
0
);
Debug
(
LDAP_DEBUG_
ANY
,
Debug
(
LDAP_DEBUG_
TRACE
,
"=> regex_matches: rc: %d %s
\n
"
,
rc
,
!
rc
?
"matches"
:
"no matches"
,
0
);
return
(
!
rc
);
...
...
servers/slapd/tools/Make-template
View file @
ac989f10
...
...
@@ -109,8 +109,11 @@ install: $(LDAP_SBINDIR) $(LDAP_SBINDIR)/edb2ldif $(LDAP_SBINDIR)/ldif2ldbm \
$(LDAP_SBINDIR)/centipede $(LDAP_SBINDIR)/ldbmtest \
$(LDAP_SBINDIR)/ldif
$(LDAP_SBINDIR): FORCE
$(LDAP_SBINDIR)/edb2ldif: build-edb2ldif
@if [ "$(HAVEISODE)" = "yes" ]; then \
@$(MKDIR) $(LDAP_SBINDIR); \
$(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(LDAP_SBINDIR); \
else \
exit 0; \
...
...
@@ -118,33 +121,42 @@ $(LDAP_SBINDIR)/edb2ldif: build-edb2ldif
$(LDAP_SBINDIR)/chlog2replog: build-chlog2replog
@if [ "$(HAVEISODE)" = "yes" ]; then \
@$(MKDIR) $(LDAP_SBINDIR); \
$(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(LDAP_SBINDIR); \
else \
exit 0; \
fi
$(LDAP_SBINDIR)/ldif2ldbm: ldif2ldbm
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(LDAP_SBINDIR)
$(LDAP_SBINDIR)/ldif2index: ldif2index
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(LDAP_SBINDIR)
$(LDAP_SBINDIR)/ldif2id2entry: ldif2id2entry
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(LDAP_SBINDIR)
$(LDAP_SBINDIR)/ldif2id2children: ldif2id2children
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(LDAP_SBINDIR)
$(LDAP_SBINDIR)/ldbmcat: ldbmcat
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(LDAP_SBINDIR)
$(LDAP_SBINDIR)/ldif: ldif
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(LDAP_SBINDIR)
$(LDAP_SBINDIR)/centipede: centipede
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(LDAP_SBINDIR)
$(LDAP_SBINDIR)/ldbmtest: ldbmtest
@$(MKDIR) $(LDAP_SBINDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(LDAP_SBINDIR)
lint: FORCE
...
...
servers/slurpd/Make-template
View file @
ac989f10
...
...
@@ -58,10 +58,8 @@ version.c: $(OBJS) $(LDIR)/liblber/liblber.a $(LDIR)/libldap/libldap.a
install: $(LDAP_LIBEXECDIR) $(LDAP_LIBEXECDIR)/slurpd
$(LDAP_LIBEXECDIR): FORCE
@-$(MKDIR) $(LDAP_LIBEXECDIR)
$(LDAP_LIBEXECDIR)/slurpd: slurpd
@-$(MKDIR) $(LDAP_LIBEXECDIR)
$(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(LDAP_LIBEXECDIR)
lint: FORCE
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment