[Fedora-directory-commits] adminserver/admserv/cfgstuff adminserver-start-admin.patch, 1.2, 1.3

Author: rmeggins Update of /cvs/dirsec/adminserver/admserv/cfgstuff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12699 Modified Files: adminserver-start-admin.patch Log Message: assume the ld_preload thing has already been patched by installing or upgrading to fds102 - this patch only upgrades libldap50 to libldap60 from now on adminserver-start-admin.patch: Index: adminserver-start-admin.patch =================================================================== RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/adminserver-start-admin.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- adminserver-start-admin.patch 11 Oct 2006 18:53:55 -0000 1.2 +++ adminserver-start-admin.patch 12 Oct 2006 02:21:45 -0000 1.3 @@ -1,16 +1,14 @@ ---- start-admin 9 Sep 2005 19:12:03 -0000 1.4 -+++ start-admin 11 Oct 2006 18:47:53 -0000 -@@ -41,17 +41,17 @@ +Index: start-admin +=================================================================== +RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-admin,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -4 -r1.5 -r1.6 +--- start-admin 7 Dec 2005 22:13:32 -0000 1.5 ++++ start-admin 11 Oct 2006 18:53:55 -0000 1.6 +@@ -48,9 +48,9 @@ - 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 + /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" @@ -19,4 +17,3 @@ fi fi - $HTTPD -k start -d $ADMSERV_ROOT -f $ADMSERV_ROOT/config/httpd.conf "$@"