diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-09-04 21:34:04 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-09-04 21:34:04 +0000 |
| commit | a0d19c0d13e61d1f713637cba445911cb8cfef68 (patch) | |
| tree | ab43d3d42eda3d85d6857010d94c9c3877c4510a /libltdl/ltdl.c | |
| parent | a4757a1dd90db5d6f1115205b452a232e4af58d3 (diff) | |
update libltdl copy
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1771 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'libltdl/ltdl.c')
| -rw-r--r-- | libltdl/ltdl.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c index 5f56fbbb..409e5beb 100644 --- a/libltdl/ltdl.c +++ b/libltdl/ltdl.c @@ -1068,17 +1068,6 @@ lt_estrdup (str) # include <sys/dl.h> #endif -#ifdef RTLD_GLOBAL -# define LT_GLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_GLOBAL DL_GLOBAL -# endif -#endif /* !RTLD_GLOBAL */ -#ifndef LT_GLOBAL -# define LT_GLOBAL 0 -#endif /* !LT_GLOBAL */ - /* We may have to define LT_LAZY_OR_NOW in the command line if we find out it does not work in some platform. */ #ifndef LT_LAZY_OR_NOW @@ -1114,7 +1103,7 @@ sys_dl_open (loader_data, filename) lt_user_data loader_data; const char *filename; { - lt_module module = dlopen (filename, LT_GLOBAL | LT_LAZY_OR_NOW); + lt_module module = dlopen (filename, LT_LAZY_OR_NOW); if (!module) { @@ -3225,9 +3214,7 @@ try_dlopen (phandle, filename) } if (!file) { - /* don't open .la files in current directory, root might get tricked to run a binary in a prepared directory */ - if(!strncmp((filename + strlen(filename) - 3), LTDL_ARCHIVE_EXT,3) || strstr(filename,"/")) - file = fopen (filename, LT_READTEXT_MODE); + file = fopen (filename, LT_READTEXT_MODE); } /* If we didn't find the file by now, it really isn't there. Set |