Attachment 218031 Details for Bug 248169 – diffs - ldapserver

[patch] diffs - ldapserver

cvsdiffs (text/plain), 7.36 KB, created by Rich Megginson on 2007-10-05 21:04:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-10-05 21:04:26 UTC

Size: 7.36 KB

patch

obsolete

>Index: ldapserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
>retrieving revision 1.59
>diff -u -8 -r1.59 Makefile.am
>--- ldapserver/Makefile.am	1 Oct 2007 23:22:37 -0000	1.59
>+++ ldapserver/Makefile.am	5 Oct 2007 21:01:07 -0000
>@@ -73,16 +73,17 @@
> configdir = $(sysconfdir)@configdir@
> sampledatadir = $(datadir)@sampledatadir@
> propertydir = $(datadir)@propertydir@
> schemadir = $(sysconfdir)@schemadir@
> serverdir = $(libdir)@serverdir@
> serverplugindir = $(libdir)@serverplugindir@
> taskdir = $(datadir)@scripttemplatedir@
> initdir = $(sysconfdir)@initdir@
>+initconfigdir = $(sysconfdir)@initconfigdir@
> instconfigdir = @instconfigdir@
> perldir = $(libdir)@perldir@
> infdir = $(datadir)@infdir@
> 
> defaultuser=@defaultuser@
> defaultgroup=@defaultgroup@
> 
> #------------------------
>@@ -1034,17 +1035,18 @@
> 	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
> 	-e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
> 	-e 's,@BUILDNUM\@,$(BUILDNUM),g' \
> 	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
> 	-e 's,@perlpath\@,$(perldir) $(libdir)/perl/arch $(libdir)/perl,g' \
> 	-e 's,@defaultuser\@,$(defaultuser),g' \
> 	-e 's,@defaultgroup\@,$(defaultgroup),g' \
> 	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
>-	-e 's,@perlexec\@,@perlexec@,g'
>+	-e 's,@perlexec\@,@perlexec@,g' \
>+	-e 's,@initconfigdir\@,$(initconfigdir),g'
> else
> fixupcmd = sed \
> 	-e 's,@bindir\@,$(bindir),g' \
> 	-e 's,@sbindir\@,$(sbindir),g' \
> 	-e 's,@libdir\@,$(libdir),g' \
> 	-e 's,@nspr_libdir\@,$(nspr_libdir),g' \
> 	-e 's,@nss_libdir\@,$(nss_libdir),g' \
> 	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
>@@ -1081,17 +1083,18 @@
> 	-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
> 	-e 's,@PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
> 	-e 's,@BUILDNUM\@,$(BUILDNUM),g' \
> 	-e 's,@NQBUILD_NUM\@,$(NQBUILDNUM),g' \
> 	-e 's,@perlpath\@,$(perldir),g' \
> 	-e 's,@defaultuser\@,$(defaultuser),g' \
> 	-e 's,@defaultgroup\@,$(defaultgroup),g' \
> 	-e 's,@with_fhs_opt\@,@with_fhs_opt@,g' \
>-	-e 's,@perlexec\@,@perlexec@,g'
>+	-e 's,@perlexec\@,@perlexec@,g' \
>+	-e 's,@initconfigdir\@,$(initconfigdir),g'
> endif
> 
> %: %.in
> 	mkdir -p $(dir $@)
> 	$(fixupcmd) $^ > $@
> 
> %/$(PACKAGE_NAME): %/initscript.in
> 	$(fixupcmd) $^ > $@
>Index: ldapserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/configure.ac,v
>retrieving revision 1.38
>diff -u -8 -r1.38 configure.ac
>--- ldapserver/configure.ac	1 Oct 2007 23:22:38 -0000	1.38
>+++ ldapserver/configure.ac	5 Oct 2007 21:01:07 -0000
>@@ -270,28 +270,30 @@
>     AC_DEFINE([HPUX11_23], [1], [HP-UX 11.23])
>     AC_DEFINE([CPU_ia64], [], [cpu type ia64])
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>     AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>     AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     # assume 64 bit
>     perlexec='/opt/perl_64/bin/perl'
>     platform="hpux"
>+    initconfigdir="/$PACKAGE_NAME/config"
>     ;;
>   hppa*-hp-hpux*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([hpux], [1], [HP-UX])
>     AC_DEFINE([HPUX], [1], [HP-UX])
>     AC_DEFINE([HPUX11], [1], [HP-UX 11])
>     AC_DEFINE([HPUX11_11], [1], [HP-UX 11.11])
>     AC_DEFINE([CPU_hppa], [], [cpu type pa-risc])
>     AC_DEFINE([OS_hpux], [1], [OS HP-UX])
>     AC_DEFINE([_POSIX_C_SOURCE], [199506L], [POSIX revision])
>     AC_DEFINE([_HPUX_SOURCE], [1], [Source namespace])
>     # assume 64 bit
>+    initconfigdir="/$PACKAGE_NAME/config"
>     perlexec='/opt/perl_64/bin/perl'
>     platform="hpux"
>     ;;
>   sparc-sun-solaris*)
>     AC_DEFINE([XP_UNIX], [1], [UNIX])
>     AC_DEFINE([SVR4], [1], [SVR4])
>     AC_DEFINE([__svr4], [1], [SVR4])
>     AC_DEFINE([__svr4__], [1], [SVR4])
>@@ -322,16 +324,29 @@
>     ;;
>   *)
>     platform=""
>     ;;
> esac
> AC_SUBST(initdir)
> AC_SUBST(perlexec)
> 
>+# set default initconfigdir if not already set
>+# value will be set so as to be relative to $(sysconfdir)
>+if test -z "$initconfigdir" ; then
>+   if test -d /etc/sysconfig ; then
>+      initconfigdir=/sysconfig
>+   elif test -d /etc/default ; then
>+      initconfigdir=/default
>+   else
>+      initconfigdir="/$PACKAGE_NAME/config"
>+   fi
>+fi
>+AC_SUBST(initconfigdir)
>+
> AM_CONDITIONAL(HPUX,test "$platform" = "hpux")
> AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
> 
> # Check for library dependencies
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
> m4_include(m4/mozldap.m4)
> m4_include(m4/db.m4)
>Index: ldapserver/ldap/admin/src/scripts/template-start-slapd.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/template-start-slapd.in,v
>retrieving revision 1.7
>diff -u -8 -r1.7 template-start-slapd.in
>--- ldapserver/ldap/admin/src/scripts/template-start-slapd.in	12 Feb 2007 19:55:10 -0000	1.7
>+++ ldapserver/ldap/admin/src/scripts/template-start-slapd.in	5 Oct 2007 21:01:07 -0000
>@@ -1,16 +1,22 @@
> #!/bin/sh
> 
> prefix="{{DS-ROOT}}"
> LD_LIBRARY_PATH=$prefix{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
> export LD_LIBRARY_PATH
> SHLIB_PATH=$prefix{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
> export SHLIB_PATH
> 
>+# source env. for all instances
>+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
>+
>+# source env. for this instance
>+[ -f @initconfigdir@/{{PRODUCT-NAME}}-{{SERV-ID}} ] && . @initconfigdir@/{{PRODUCT-NAME}}-{{SERV-ID}}
>+
> # Script that starts the ns-slapd server.
> # Exit status can be:
> #       0: Server started successfully
> #       1: Server could not be started
> #       2: Server already running
> 
> DS_CONFIG_DIR={{CONFIG-DIR}}
> export DS_CONFIG_DIR
>Index: ldapserver/wrappers/initscript.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/wrappers/initscript.in,v
>retrieving revision 1.6
>diff -u -8 -r1.6 initscript.in
>--- ldapserver/wrappers/initscript.in	13 Aug 2007 15:35:36 -0000	1.6
>+++ ldapserver/wrappers/initscript.in	5 Oct 2007 21:01:07 -0000
>@@ -81,16 +81,18 @@
> instbase="@instconfigdir@"
> 
> 
> [ -f $exec ] || exit 0
> 
> 
> umask 077
> 
>+[ -f @initconfigdir@/@package_name@ ] && . @initconfigdir@/@package_name@
>+
> INSTANCES=""
> 
> for FILE in `/bin/ls -d $instbase/slapd-* 2>/dev/null`; do
>     if [ -d "$FILE" ] ; then
>         inst=`echo "$FILE" | sed -e "s|$instbase/slapd-||"`
>         INSTANCES="$INSTANCES $inst"
>     fi
> done
>@@ -138,17 +140,22 @@
>                     rm -f $pidfile
>                 fi
>             fi
>             server_started=0
>             if [ $server_running -eq 0 ] ; then
>                 rm -f $pidfile
>                 rm -f $startpidfile
>                 fix_pid_dir_ownership $instbase/slapd-$instance
>-                $exec -D $instbase/slapd-$instance -i $pidfile -w $startpidfile
>+                # start the directory server in a subshell so that the instance specific
>+                # init config environment will not apply to any other instance
>+                (
>+                    [ -f @initconfigdir@/slapd-$instance ] && . @initconfigdir@/slapd-$instance
>+                    $exec -D $instbase/slapd-$instance -i $pidfile -w $startpidfile
>+                )
>                 if [ $? -eq 0 ]; then
>                     server_started=1 # well, perhaps not running, but started ok
>                 else
>                     failure; echo
>                     errors=`expr $errors + 1`
>                 fi
>             fi
>             # ok, if we started the server successfully, let's see if it is really

Actions: View | Diff

Attachments on bug 248169: 159210 | 217951 | 217961 | 218031 | 218041 | 218101 | 218121 | 218201 | 218211