Directory rule is didn't work... use brute force

diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template
index 9fab1e99bdcedf335bbcca670b8e167bf9d51538..0f476efcfbf2d31b851d84edfe96be6118658b66 100644 (file)
--- a/servers/slapd/Make-template
+++ b/servers/slapd/Make-template
@@ -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)
 

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 6917f5e1715aa85c82bf07ee20fdeef6fb5775eb..95ad25942664b6cb1c21242fab96d1badac39ce5 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -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 );

diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template
index 7464e9aa21e2ffb4942188049853be0bb9166f88..0bcdc5412f6ad3716bc254a98b97fc697775362e 100644 (file)
--- a/servers/slapd/tools/Make-template
+++ b/servers/slapd/tools/Make-template
@@ -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

diff --git a/servers/slurpd/Make-template b/servers/slurpd/Make-template
index c0b34f38883750e6414f0089639fb9c355535a64..bbd4ec18fd692bc651e13ea71807143db4d8f6ec 100644 (file)
--- a/servers/slurpd/Make-template
+++ b/servers/slurpd/Make-template
@@ -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