Fix out-of-date bits in EXEC_ORIGIN patch

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 50cbed2d22946a824cb704384cff3276234d0c11..4d8af1db410d9ef860f35fe80873b0bd98fb609a 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -275,9 +275,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result)
            repl = GLRO(dl_platform);
          else if ((len = is_dst (start, name, "LIB", 0)) != 0)
            repl = DL_DST_LIB;
-         else if ((len = is_dst (start, name, "EXEC_ORIGIN", is_path, 0)) != 0)
+         else if ((len = is_dst (start, name, "EXEC_ORIGIN", 0)) != 0)
            {
-             if (INTUSE(__libc_enable_secure) != 0)
+             if (__libc_enable_secure)
                _dl_fatal_printf ("$EXEC_ORIGIN rpath entry not allowed in setuid/setgid executables.\n");
 
              repl = GLRO(google_exec_origin_dir);

diff --git a/elf/rtld.c b/elf/rtld.c
index 79351e53edeb0bec2eb080bd8192e70890280b00..90f7eebdcf9ee6885942ba5150955f2c100983de 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1041,7 +1041,7 @@ of this helper program; chances are you did not intend to run this program.\n\
                        in LIST\n\
   --audit LIST          use objects named in LIST as auditors\n");
 
-      set_exec_origin_dir (INTUSE(_dl_argv)[1]);
+      set_exec_origin_dir (_dl_argv[1]);
 
       ++_dl_skip_args;
       --_dl_argc;