Attachment 315318 Details for Bug 451702 – real diffs

[patch] real diffs

diffs.bug451702 (text/plain), 1.24 KB, created by Rich Megginson on 2008-08-29 01:58:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-08-29 01:58:48 UTC

Size: 1.24 KB

patch

obsolete

>Index: adminserver/admserv/cfgstuff/start-ds-admin.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-ds-admin.in,v
>retrieving revision 1.5
>diff -u -8 -r1.5 start-ds-admin.in
>--- adminserver/admserv/cfgstuff/start-ds-admin.in	10 Oct 2007 20:28:29 -0000	1.5
>+++ adminserver/admserv/cfgstuff/start-ds-admin.in	29 Aug 2008 01:38:18 -0000
>@@ -36,21 +36,20 @@
> # see if httpd is linked with the openldap libraries - we need to override them
> OS=`uname -s`
> if [ $OS = "Linux" ]; then
>     hasol=0
> 
>     /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1
> 
>     if [ $hasol -eq 1 ] ; then
>-        nss_libdir="@nss_libdir@"
>-        if [ -n "$nss_libdir" ] ; then
>-            LD_PRELOAD="$nss_libdir/libssl3.so @ldapsdk_libdir@/libldap60.so"
>-        else
>-            LD_PRELOAD="@ldapsdk_libdir@/libldap60.so"
>+        LD_PRELOAD="@ldapsdk_libdir@/libldap60.so"
>+        ssl_lib="@nss_libdir@/libssl3.so"
>+        if [ -f "$ssl_lib" ] ; then
>+            LD_PRELOAD="$ssl_lib $LD_PRELOAD"
>         fi
>         export LD_PRELOAD
>     fi
> fi
> 
> # mod_deflate is not supported on HP-UX using the /opt/hpws apache
> if [ $OS = "HP-UX" ] ; then
>     OMIT_DEFLATE="-DOmitDeflate"

Actions: View | Diff

Attachments on bug 451702: 315317 | 315318 | 315319