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

[Doctor Conrad]

Author: rmeggins

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

Modified Files:
	start-admin adminserver-start-admin.patch 
Log Message:
Resolves: bug 210916
Bug Description: Admin Server doesn't start on RHEL3 - libldap60.so + sasl
Reviewed by: nkinder (Thanks!)
Fix Description: Adding libldap60.so to the LD_PRELOAD solves the problem.  Loading
libldap60.so early forces the dynamic linker to find and resolve libsasl2.so.  So I
modified start-admin to do the LD_PRELOAD of libldap60.  I also updated the patch file
which is used when upgrading 1.0.2 to 1.0.3.
Platforms tested: RHEL3
Flag Day: no
Doc impact: no 



Index: start-admin
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/start-admin,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- start-admin	11 Oct 2006 18:53:55 -0000	1.6
+++ start-admin	16 Oct 2006 15:56:26 -0000	1.7
@@ -50,8 +50,11 @@
 
     if [ $hasol -eq 1 ] ; then
         LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so
${SERVER_ROOT}/bin/admin/lib/libldap60.so"
-        export LD_PRELOAD
+    else
+# RHEL3 needs this in order to resolve the libldap60 SASL dependency
+        LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libldap60.so"
     fi
+    export LD_PRELOAD
 fi
 
 $HTTPD -k start -d $ADMSERV_ROOT -f $ADMSERV_ROOT/config/httpd.conf "$@"

adminserver-start-admin.patch:

Index: adminserver-start-admin.patch
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/adminserver-start-admin.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- adminserver-start-admin.patch	12 Oct 2006 02:21:45 -0000	1.3
+++ adminserver-start-admin.patch	16 Oct 2006 15:56:26 -0000	1.4
@@ -2,18 +2,26 @@
 ===================================================================
 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
+diff -u -8 -r1.5 start-admin
 --- 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 @@
++++ start-admin	16 Oct 2006 14:24:56 -0000
+@@ -44,14 +44,17 @@
+ # 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
 -        LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so
${SERVER_ROOT}/bin/admin/lib/libldap50.so"
+-        export LD_PRELOAD
 +        LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libssl3.so
${SERVER_ROOT}/bin/admin/lib/libldap60.so"
-         export LD_PRELOAD
++    else
++# RHEL3 needs this in order to resolve the libldap60 SASL dependency
++        LD_PRELOAD="${SERVER_ROOT}/bin/admin/lib/libldap60.so"
      fi
++    export LD_PRELOAD
  fi
  
+ $HTTPD -k start -d $ADMSERV_ROOT -f $ADMSERV_ROOT/config/httpd.conf "$@"