[Fedora-directory-commits] adminserver/admserv/cfgstuff start-admin, 1.4, 1.5

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	start-admin 
Log Message:
Bug(s) fixed: 175187
Bug Description: Apache linked with libldap.so not libldap-2.2.so on Fedora Core 2
Reviewed by: Nathan (Thanks!)
Fix Description: grep for "libldap" not "libldap-".  On Fedora Core 2, Apache is linked with libldap.so, not the libldap-2.2.so as on later OS versions.  So, just changing it to look for libldap on all platforms should work just fine.  I've also changed the spec file to apply the patch when upgrading from fds10 to fds101.
Platforms tested: Fedora Core 4 (I don't have an FC 2 system to test this on, but the bug reported applied the same patch and it worked for him)
Flag Day: no
Doc impact: no 



Index: start-admin
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-admin,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- start-admin	9 Sep 2005 19:12:03 -0000	1.4
+++ start-admin	7 Dec 2005 22:13:32 -0000	1.5
@@ -46,7 +46,7 @@
 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"