[Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver-start-admin.patch, NONE, 1.1

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1354

Added Files:
	adminserver-start-admin.patch 
Log Message:
patch to convert libldap- to libldap

adminserver-start-admin.patch:

--- NEW FILE adminserver-start-admin.patch ---
--- start-admin	9 Sep 2005 19:12:03 -0000	1.4
+++ start-admin	7 Dec 2005 17:27:40 -0000
@@ -41,17 +41,17 @@
 
 HTTPD=%%%httpd%%%
 
 # 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
+    /usr/bin/ldd $HTTPD 2>&1 | grep libldap > /dev/null 2>&1 && hasol=1
 
     if [ $hasol -eq 1 ] ; then
         LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so ${SERVER_ROOT}/bin/admin/lib/libldap50.so"
         export LD_PRELOAD
     fi
 fi
 
 $HTTPD -k start -d $ADMSERV_ROOT -f $ADMSERV_ROOT/config/httpd.conf "$@"