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

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Wed Oct 11 18:53:58 UTC 2006


Author: rmeggins

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

Modified Files:
	adminserver-start-admin.patch start-admin 
Log Message:
use libldap60 in preload

adminserver-start-admin.patch:

Index: adminserver-start-admin.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/adminserver-start-admin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adminserver-start-admin.patch	7 Dec 2005 19:31:08 -0000	1.1
+++ adminserver-start-admin.patch	11 Oct 2006 18:53:55 -0000	1.2
@@ -1,5 +1,5 @@
 --- start-admin	9 Sep 2005 19:12:03 -0000	1.4
-+++ start-admin	7 Dec 2005 17:27:40 -0000
++++ start-admin	11 Oct 2006 18:47:53 -0000
 @@ -41,17 +41,17 @@
  
  HTTPD=%%%httpd%%%
@@ -13,7 +13,8 @@
 +    /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"
+-        LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so ${SERVER_ROOT}/bin/admin/lib/libldap50.so"
++        LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so ${SERVER_ROOT}/bin/admin/lib/libldap60.so"
          export LD_PRELOAD
      fi
  fi


Index: start-admin
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-admin,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -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
@@ -49,7 +49,7 @@
     /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"
+        LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so ${SERVER_ROOT}/bin/admin/lib/libldap60.so"
         export LD_PRELOAD
     fi
 fi




More information about the Fedora-directory-commits mailing list