diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-05-20 00:15:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-05-20 00:15:00 +0000 |
| commit | b0a01055eb0ff324fd5e2b44fa9687035e5f3204 (patch) | |
| tree | 9f51b2cc47610c6266f274c22932d90657a6be6b /elf/dl-load.c | |
| parent | 310930c1b53bf795e62572d7b7f2fe384cbdc0d4 (diff) | |
| download | glibc-b0a01055eb0ff324fd5e2b44fa9687035e5f3204.tar glibc-b0a01055eb0ff324fd5e2b44fa9687035e5f3204.tar.gz glibc-b0a01055eb0ff324fd5e2b44fa9687035e5f3204.tar.bz2 glibc-b0a01055eb0ff324fd5e2b44fa9687035e5f3204.zip | |
Update.
1998-05-20 00:10 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-load.c: Rename option and variable from ignore-rpath to
inhibit-rpath.
* elf/dl-support.c: Likewise.
* elf/ldsodefs.h: Likewise.
* elf/rtld.c: Likewise.
* iconvdata/run-iconv-test.sh: Likewise.
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 4fc0a022d6..5a70dec85c 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -290,13 +290,13 @@ decompose_rpath (const char *rpath, size_t additional_room, const char *where) size_t nelems; /* First see whether we must forget the RPATH from this object. */ - if (_dl_ignore_rpath != NULL && !__libc_enable_secure) + if (_dl_inhibit_rpath != NULL && !__libc_enable_secure) { - const char *found = strstr (_dl_ignore_rpath, where); + const char *found = strstr (_dl_inhibit_rpath, where); if (found != NULL) { size_t len = strlen (where); - if ((found == _dl_ignore_rpath || found[-1] == ':') + if ((found == _dl_inhibit_rpath || found[-1] == ':') && (found[len] == '\0' || found[len] == ':')) { /* This object is on the list of objects for which the RPATH |