diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-01-25 08:10:15 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-01-25 08:10:15 -0200 |
| commit | 83e6b59625f45db1eee93e5684091f740c52a083 (patch) | |
| tree | 311355a712fdee74a74c9084ee4a29d9d25c626d /elf/rtld.c | |
| parent | b96e22d080688867d24a9015fd50c199144d0e47 (diff) | |
| download | glibc-83e6b59625f45db1eee93e5684091f740c52a083.tar.gz glibc-83e6b59625f45db1eee93e5684091f740c52a083.tar.xz glibc-83e6b59625f45db1eee93e5684091f740c52a083.zip | |
[elf] Revert 8e889c5da3 (BZ#24122)
It triggers an invalid build issue on GCC8+ and does not covers all corner cases.
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/elf/rtld.c b/elf/rtld.c index 9e0f752482..5d97f41b7b 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1453,12 +1453,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", unsigned int (*laversion) (unsigned int); unsigned int lav; - if (err_str != NULL) - goto not_loaded; - - if ((laversion = largs.result) != NULL - && (lav = laversion (LAV_CURRENT)) > 0 - && lav <= LAV_CURRENT) + if (err_str == NULL + && (laversion = largs.result) != NULL + && (lav = laversion (LAV_CURRENT)) > 0 + && lav <= LAV_CURRENT) { /* Allocate structure for the callback function pointers. This call can never fail. */ @@ -1540,25 +1538,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", assert (GL(dl_ns)[ns]._ns_nloaded == 0); GL(dl_tls_max_dtv_idx) = tls_idx; - if (GLRO(dl_debug_mask) & DL_DEBUG_FILES) - { - _dl_debug_printf ("\ -\nfile=%s cannot be loaded as audit interface; ignored.\n", name); - if (laversion == NULL) - _dl_debug_printf ( -" la_version function not found.\n"); - else - { - if (lav == 0) - _dl_debug_printf ( -" auditor requested to be ignored (returned version of 0).\n"); - else - _dl_debug_printf ( -" auditor disabled since expected version %d is greater than " -"supported version %d.\n", - lav, LAV_CURRENT); - } - } + goto not_loaded; } } } |