diff -ur glibc-2.3.6.orig/grp/tst_fgetgrent.sh glibc-2.3.6/grp/tst_fgetgrent.sh
--- glibc-2.3.6.orig/grp/tst_fgetgrent.sh	2001-07-05 21:54:46.000000000 -0700
+++ glibc-2.3.6/grp/tst_fgetgrent.sh	2006-06-13 20:36:53.000000000 -0700
@@ -24,7 +24,8 @@
 rtld_installed_name=$1; shift
 
 testout=${common_objpfx}/grp/tst_fgetgrent.out
-library_path=${common_objpfx}
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
 
 result=0
 
Only in glibc-2.3.6.orig/iconvdata: .ERM.swp
diff -ur glibc-2.3.6.orig/iconvdata/run-iconv-test.sh glibc-2.3.6/iconvdata/run-iconv-test.sh
--- glibc-2.3.6.orig/iconvdata/run-iconv-test.sh	2002-05-14 23:00:40.000000000 -0700
+++ glibc-2.3.6/iconvdata/run-iconv-test.sh	2006-06-13 22:13:10.000000000 -0700
@@ -34,7 +34,7 @@
 export GCONV_PATH
 
 # We have to have some directories in the library path.
-LIBPATH=$codir:$codir/iconvdata
+LIBPATH=$codir:$codir/iconvdata:$codir/dlfcn
 
 # How the start the iconv(1) program.
 ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
diff -ur glibc-2.3.6.orig/iconvdata/tst-table.sh glibc-2.3.6/iconvdata/tst-table.sh
--- glibc-2.3.6.orig/iconvdata/tst-table.sh	2002-04-24 14:39:35.000000000 -0700
+++ glibc-2.3.6/iconvdata/tst-table.sh	2006-06-14 12:42:10.000000000 -0700
@@ -59,8 +59,11 @@
   irreversible=${charset}.irreversible
 fi
 
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
+
 # iconv in one direction.
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${common_objpfx}elf/ld.so --library-path $library_path \
 ${objpfx}tst-table-from ${charset} \
   > ${objpfx}tst-${charset}.table
 
diff -ur glibc-2.3.6.orig/intl/tst-codeset.sh glibc-2.3.6/intl/tst-codeset.sh
--- glibc-2.3.6.orig/intl/tst-codeset.sh	2002-04-05 21:08:21.000000000 -0800
+++ glibc-2.3.6/intl/tst-codeset.sh	2006-06-13 21:00:10.000000000 -0700
@@ -38,6 +38,9 @@
 LOCPATH=${common_objpfx}localedata
 export LOCPATH
 
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
+
 ${common_objpfx}elf/ld.so --library-path $common_objpfx \
 ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
 
diff -ur glibc-2.3.6.orig/intl/tst-gettext.sh glibc-2.3.6/intl/tst-gettext.sh
--- glibc-2.3.6.orig/intl/tst-gettext.sh	2004-08-15 12:28:18.000000000 -0700
+++ glibc-2.3.6/intl/tst-gettext.sh	2006-06-13 21:01:46.000000000 -0700
@@ -51,9 +51,12 @@
 LOCPATH=${common_objpfx}localedata
 export LOCPATH
 
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
+
 # Now run the test.
 MALLOC_TRACE=$malloc_trace LOCPATH=${objpfx}localedir:$LOCPATH \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${common_objpfx}elf/ld.so --library-path $library_path \
 ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
 
 exit $?
diff -ur glibc-2.3.6.orig/intl/tst-gettext2.sh glibc-2.3.6/intl/tst-gettext2.sh
--- glibc-2.3.6.orig/intl/tst-gettext2.sh	2003-09-16 13:50:08.000000000 -0700
+++ glibc-2.3.6/intl/tst-gettext2.sh	2006-06-13 21:01:10.000000000 -0700
@@ -65,8 +65,11 @@
 LOCPATH=${objpfx}domaindir
 export LOCPATH
 
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
+
 # Now run the test.
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${common_objpfx}elf/ld.so --library-path $library_path \
 ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
 cmp ${objpfx}tst-gettext2.out - <<EOF
 String1 - Lang1: 1st string
diff -ur glibc-2.3.6.orig/intl/tst-translit.sh glibc-2.3.6/intl/tst-translit.sh
--- glibc-2.3.6.orig/intl/tst-translit.sh	2002-04-05 21:08:21.000000000 -0800
+++ glibc-2.3.6/intl/tst-translit.sh	2006-06-13 21:02:09.000000000 -0700
@@ -33,7 +33,10 @@
 LOCPATH=${common_objpfx}localedata
 export LOCPATH
 
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
+
+${common_objpfx}elf/ld.so --library-path $library_path \
 ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
 
 exit $?
diff -ur glibc-2.3.6.orig/linuxthreads/tst-signal.sh glibc-2.3.6/linuxthreads/tst-signal.sh
--- glibc-2.3.6.orig/linuxthreads/tst-signal.sh	2002-01-15 16:28:45.000000000 -0800
+++ glibc-2.3.6/linuxthreads/tst-signal.sh	2006-06-13 22:14:07.000000000 -0700
@@ -24,5 +24,5 @@
 # set up to ignore SIGHUP
 trap '' 1
 
-exec ${common_objpfx}elf/ld.so --library-path $common_objpfx:${common_objpfx}linuxthreads \
+exec ${common_objpfx}elf/ld.so --library-path $common_objpfx:${common_objpfx}linuxthreads:${common_objpfx}/dlfcn \
      ${common_objpfx}linuxthreads/tst-signal
diff -ur glibc-2.3.6.orig/linuxthreads/tst-tls2.sh glibc-2.3.6/linuxthreads/tst-tls2.sh
--- glibc-2.3.6.orig/linuxthreads/tst-tls2.sh	2003-09-01 17:29:31.000000000 -0700
+++ glibc-2.3.6/linuxthreads/tst-tls2.sh	2006-06-13 22:14:36.000000000 -0700
@@ -5,8 +5,8 @@
 rtld_installed_name=$1; shift
 logfile=$common_objpfx/linuxthreads/tst-tls2.out
 
-# We have to find libc and linuxthreads
-library_path=${common_objpfx}:${common_objpfx}linuxthreads
+# We have to find libc and linuxthreads (also libdl for sandbox)
+library_path=${common_objpfx}:${common_objpfx}linuxthreads:${common_objpfx}/dlfcn
 tst_tls1="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
 	  ${common_objpfx}/linuxthreads/tst-tls1"
 
diff -ur glibc-2.3.6.orig/malloc/tst-mtrace.sh glibc-2.3.6/malloc/tst-mtrace.sh
--- glibc-2.3.6.orig/malloc/tst-mtrace.sh	2001-07-05 21:55:35.000000000 -0700
+++ glibc-2.3.6/malloc/tst-mtrace.sh	2006-06-13 20:32:11.000000000 -0700
@@ -24,9 +24,12 @@
 status=0
 trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
 
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
+
 MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \
 LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \
-${common_objpfx}elf/ld.so --library-path $common_objpfx \
+${common_objpfx}elf/ld.so --library-path $library_path \
   ${common_objpfx}malloc/tst-mtrace || status=1
 
 if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
diff -ur glibc-2.3.6.orig/nptl/tst-tls6.sh glibc-2.3.6/nptl/tst-tls6.sh
--- glibc-2.3.6.orig/nptl/tst-tls6.sh	2003-09-02 15:02:59.000000000 -0700
+++ glibc-2.3.6/nptl/tst-tls6.sh	2006-06-13 19:19:33.000000000 -0700
@@ -5,8 +5,8 @@
 rtld_installed_name=$1; shift
 logfile=$common_objpfx/nptl/tst-tls6.out
 
-# We have to find libc and nptl
-library_path=${common_objpfx}:${common_objpfx}nptl
+# We have to find libc and nptl (also libdl in case sandbox is in use)
+library_path=${common_objpfx}:${common_objpfx}nptl:${common_objpfx}/dlfcn
 tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
 	  ${common_objpfx}/nptl/tst-tls5"
 
diff -ur glibc-2.3.6.orig/posix/globtest.sh glibc-2.3.6/posix/globtest.sh
--- glibc-2.3.6.orig/posix/globtest.sh	2003-10-26 17:35:23.000000000 -0800
+++ glibc-2.3.6/posix/globtest.sh	2006-06-13 20:11:08.000000000 -0700
@@ -18,7 +18,7 @@
 esac
 
 # We have to find the libc and the NSS modules.
-library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod
+library_path=${common_objpfx}:${common_objpfx}nss:${common_objpfx}nis:${common_objpfx}db2:${common_objpfx}hesiod:${common_objpfx}/dlfcn
 
 # Since we use `sort' we must make sure to use the same locale everywhere.
 LC_ALL=C
diff -ur glibc-2.3.6.orig/posix/tst-getconf.sh glibc-2.3.6/posix/tst-getconf.sh
--- glibc-2.3.6.orig/posix/tst-getconf.sh	2002-09-01 04:11:25.000000000 -0700
+++ glibc-2.3.6/posix/tst-getconf.sh	2006-06-13 19:38:57.000000000 -0700
@@ -10,7 +10,10 @@
 else
   rtld_installed_name=$1; shift
   runit() {
-    ${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} "$@"
+    
+  # make sure libdl is also in path in case sandbox is in use
+  library_path=${common_objpfx}:${common_objpfx}/dlfcn
+    ${elf_objpfx}${rtld_installed_name} --library-path ${library_path} "$@"
   }
 fi
 
diff -ur glibc-2.3.6.orig/posix/wordexp-tst.sh glibc-2.3.6/posix/wordexp-tst.sh
--- glibc-2.3.6.orig/posix/wordexp-tst.sh	2000-10-20 09:23:30.000000000 -0700
+++ glibc-2.3.6/posix/wordexp-tst.sh	2006-06-13 20:10:16.000000000 -0700
@@ -19,8 +19,11 @@
 "
 export IFS
 
+# make sure libdl is also in path in case sandbox is in use
+library_path=${common_objpfx}:${common_objpfx}/dlfcn
+
 failed=0
-${elf_objpfx}${rtld_installed_name} --library-path ${common_objpfx} \
+${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
 ${common_objpfx}posix/wordexp-test '$*' > ${testout}1
 cat <<"EOF" | cmp - ${testout}1 >> $logfile || failed=1
 wordexp returned 0