aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-08-15 20:23:40 +0000
committerUlrich Drepper <drepper@redhat.com>2004-08-15 20:23:40 +0000
commit28977c2c1acb789660ad47e0d88e42486059c916 (patch)
treed1b43dafc0c36dc311a9bbc2177167334ff5354c /elf
parent1e6d2101ea891d63c11e8ad096f049fbb7e35242 (diff)
downloadglibc-28977c2c1acb789660ad47e0d88e42486059c916.zip
glibc-28977c2c1acb789660ad47e0d88e42486059c916.tar.gz
glibc-28977c2c1acb789660ad47e0d88e42486059c916.tar.bz2
Update.
* sysdeps/posix/getaddrinfo.c (gaih_addrtuple): Change type of addr to avoid casts. (gethosts): Removed. (gethosts2): Renamed to gethosts. Make it usable for family != AF_UNSPEC. Fix AI_V4MAPPED. (gaih_inet): Remove use of old gethosts. Always use what used to be gethosts2. If entry is found, try to use the same NSS module's getcanonname_r function. Use gethostbyaddr for AI_CANONNAME only if getcanonname_r was not available. Fix filtering of AI_V4MAPPED addresses. Numerous cleanups. * resolv/nss_dns/dns-canon.c: New file. * resolv/Makefile (libnss_dns-routines): Add dns-canon. * resolv/Versions (libnss_dns): Add _nss_dns_getcanonname_r. * elf/Makefile: Add rules to build and run tst-dlopenrpath. * elf/tst-dlopenrpath.c: New file. * elf/tst-dlopenrpathmod.c: New file. * intl/tst-gettext.sh: Adjust for change of de.po file to UTF-8.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile13
-rw-r--r--elf/tst-dlopenrpath.c74
-rw-r--r--elf/tst-dlopenrpathmod.c36
3 files changed, 120 insertions, 3 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 9bbc304..ac8319b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -82,7 +82,7 @@ distribute := rtld-Rules \
tst-array1.exp tst-array2.exp tst-array4.exp \
tst-array2dep.c tst-piemod1.c \
tst-execstack-mod.c tst-dlmodcount.c \
- check-textrel.c dl-sysdep.h
+ check-textrel.c dl-sysdep.h test-dlopenrpathmod.c
CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
@@ -152,7 +152,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \
circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8 \
tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-align \
- $(tests-execstack-$(have-z-execstack)) tst-dlmodcount
+ $(tests-execstack-$(have-z-execstack)) tst-dlmodcount tst-dlopenrpath
# reldep9
test-srcs = tst-pathopt
tests-vis-yes = vismain
@@ -184,7 +184,8 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
circlemod3 circlemod3a \
reldep8mod1 reldep8mod2 reldep8mod3 \
reldep9mod1 reldep9mod2 reldep9mod3 \
- tst-alignmod $(modules-execstack-$(have-z-execstack))
+ tst-alignmod $(modules-execstack-$(have-z-execstack)) \
+ tst-dlopenrpathmod
ifeq (yes,$(have-initfini-array))
modules-names += tst-array2dep
endif
@@ -747,3 +748,9 @@ $(objpfx)tst-dlmodcount: $(libdl)
$(objpfx)tst-dlmodcount.out: $(test-modules)
endif
+
+$(objpfx)tst-dlopenrpathmod.so: $(libdl)
+$(objpfx)tst-dlopenrpath: $(objpfx)tst-dlopenrpathmod.so $(libdl)
+CFLAGS-tst-dlopenrpath.c += -DPFX=\"$(objpfx)\"
+LDFLAGS-tst-dlopenrpathmod.so += -Wl,-rpath,\$$ORIGIN/test-subdir
+$(objpfx)tst-dlopenrpath.out: $(objpfx)firstobj.so
diff --git a/elf/tst-dlopenrpath.c b/elf/tst-dlopenrpath.c
new file mode 100644
index 0000000..964f103
--- /dev/null
+++ b/elf/tst-dlopenrpath.c
@@ -0,0 +1,74 @@
+/* Copyright (C) 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <dlfcn.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
+
+extern int foo (void);
+
+static const char testsubdir[] = PFX "test-subdir";
+
+
+static int
+do_test (void)
+{
+ struct stat64 st;
+ int result = 1;
+
+ if (mkdir (testsubdir, 0777) != 0
+ && (errno != EEXIST
+ || stat64 (testsubdir, &st) != 0
+ || !S_ISDIR (st.st_mode)))
+ {
+ printf ("cannot create directory %s\n", testsubdir);
+ return 1;
+ }
+
+ if (system ("cp " PFX "firstobj.so " PFX "test-subdir/in-subdir.so") != 0)
+ {
+ puts ("cannot copy DSO");
+ return 1;
+ }
+
+ void *p = dlopen ("in-subdir.so", RTLD_LAZY|RTLD_LOCAL);
+ if (p != NULL)
+ {
+ puts ("succeeded in opening in-subdir.so from do_test");
+ dlclose (p);
+ goto out;
+ }
+
+ result = foo ();
+
+ out:
+#if 0
+ unlink (PFX "test-subdir/in-subdir.so");
+ rmdir (testsubdir);
+#endif
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/elf/tst-dlopenrpathmod.c b/elf/tst-dlopenrpathmod.c
new file mode 100644
index 0000000..8fe7873
--- /dev/null
+++ b/elf/tst-dlopenrpathmod.c
@@ -0,0 +1,36 @@
+/* Copyright (C) 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <dlfcn.h>
+#include <stdio.h>
+
+
+int
+foo (void)
+{
+ void *p = dlopen ("in-subdir.so", RTLD_LAZY|RTLD_LOCAL);
+ if (p != NULL)
+ {
+ dlclose (p);
+ return 0;
+ }
+
+ puts ("couldn't open in-subdir.so from foo");
+ return 1;
+}