aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-04-13 21:28:18 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-04-13 21:28:18 +0200
commita12ae89f860229cbe5ba91f1f9cf17cc5a9ede31 (patch)
tree3b22b435b0081a1f52f68db25d66b253d0b71337 /elf
parent44500cbb25bc6e76723304b9ff39f875c04309f9 (diff)
downloadglibc-a12ae89f860229cbe5ba91f1f9cf17cc5a9ede31.zip
glibc-a12ae89f860229cbe5ba91f1f9cf17cc5a9ede31.tar.gz
glibc-a12ae89f860229cbe5ba91f1f9cf17cc5a9ede31.tar.bz2
Assume that O_NOFOLLOW is always defined
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-profile.c7
-rw-r--r--elf/rtld.c4
2 files changed, 1 insertions, 10 deletions
diff --git a/elf/dl-profile.c b/elf/dl-profile.c
index 01aaf31..a4f1108 100644
--- a/elf/dl-profile.c
+++ b/elf/dl-profile.c
@@ -325,12 +325,7 @@ _dl_start_profile (void)
*cp++ = '/';
__stpcpy (__stpcpy (cp, GLRO(dl_profile)), ".profile");
-#ifdef O_NOFOLLOW
-# define EXTRA_FLAGS | O_NOFOLLOW
-#else
-# define EXTRA_FLAGS
-#endif
- fd = __open (filename, O_RDWR | O_CREAT EXTRA_FLAGS, DEFFILEMODE);
+ fd = __open (filename, O_RDWR | O_CREAT | O_NOFOLLOW, DEFFILEMODE);
if (fd == -1)
{
char buf[400];
diff --git a/elf/rtld.c b/elf/rtld.c
index 5986eaf..319ef06 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2525,11 +2525,7 @@ process_envvars (enum mode *modep)
messages to this file. */
else if (any_debug && debug_output != NULL)
{
-#ifdef O_NOFOLLOW
const int flags = O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW;
-#else
- const int flags = O_WRONLY | O_APPEND | O_CREAT;
-#endif
size_t name_len = strlen (debug_output);
char buf[name_len + 12];
char *startp;