Import slapd.conf mode change (with typo correction) from -devel.

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 7e84bc69be6de72a4dc7c062b43d67ec514c8105..815a523030149a3f38c146f75806c5a7ea33d804 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -117,15 +117,20 @@ install-conf: FORCE
        @-$(MKDIR) $(sysconfdir)
        @for i in $(CFFILES); do \
                tmpcf=/tmp/$$i.$$ ; \
+               if test $$i = slapd.conf ; then \
+                       mode=600 ; \
+               else \
+                       mode=644 ; \
+               fi ; \
                $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $(srcdir)/$$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; \
+                       echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i"; \
+                       $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i; \
                else \
                        echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
                fi; \
-               $(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i.default; \
+               $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i.default ; \
                $(RM) -f $$tmpcf ; \
        done