dn_parent(" ") should be NULL.

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 5b0c6ed0d4a36caeef64a8da5ab348f764ca3149..5f058307ac1ecfb5cbcb76a475ff31a3f486d769 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -22,6 +22,12 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
+# $(LTHREAD_LIBS) must be last
+XLIBS = libbackends.a -lavl -lldbm -lldif -lldap -llber -llthread -llutil
+XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
+       $(PERL_LDFLAGS) $(KRB_LIBS) $(LUTIL_LIBS)
+XXXLIBS = $(LTHREAD_LIBS)
+
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
 
@@ -30,10 +36,6 @@ all-local-srv: FORCE
        $(MAKE) $(MFLAGS) slapd
        (cd tools; $(MAKE) $(MFLAGS) all)
 
-XLIBS = @SLAPD_LIBS@ libbackends.a \
-       -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \
-       $(KRB_LIBS) -llutil @LUTIL_LIBS@
-
 slapd: version.o
        $(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
 
@@ -115,16 +117,21 @@ install-conf: FORCE
        @-$(MKDIR) $(sysconfdir)
        @for i in $(CFFILES); do \
                tmpcf=/tmp/$$i.$$ ; \
-               $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $$i > $$tmpcf ; \
+               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; \
-               $(RM) -f /tmp/slapd.$$ ; \
+               $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(sysconfdir)/$$i.default ; \
+               $(RM) -f $$tmpcf ; \
        done
 
 install-tools: FORCE