| Patrick Williams | f1e5d69 | 2016-03-30 15:21:19 -0500 | [diff] [blame] | 1 | From cb71e4beea3b3b11e5951f95c829cd2eee9fcf7b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 12 Sep 2015 19:10:04 +0000 |
| 4 | Subject: [PATCH 22/31] Use getenv when secure versions are not available |
| 5 | |
| 6 | musl doesnt implement secure version, so we default |
| 7 | to it if configure does not detect a secure imeplementation |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | Upstream-Status: Rejected |
| 12 | |
| 13 | src/basic/missing.h | 5 +++-- |
| 14 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/src/basic/missing.h b/src/basic/missing.h |
| 17 | index bf9b490..d6dbc7d 100644 |
| 18 | --- a/src/basic/missing.h |
| 19 | +++ b/src/basic/missing.h |
| 20 | @@ -584,13 +584,14 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle |
| 21 | return syscall(__NR_name_to_handle_at, fd, name, handle, mnt_id, flags); |
| 22 | } |
| 23 | #endif |
| 24 | - |
| 25 | -#ifndef HAVE_SECURE_GETENV |
| 26 | +#ifdef HAVE_SECURE_GETENV |
| 27 | # ifdef HAVE___SECURE_GETENV |
| 28 | # define secure_getenv __secure_getenv |
| 29 | # else |
| 30 | # error "neither secure_getenv nor __secure_getenv are available" |
| 31 | # endif |
| 32 | +#else |
| 33 | +# define secure_getenv getenv |
| 34 | #endif |
| 35 | |
| 36 | #ifndef CIFS_MAGIC_NUMBER |
| 37 | -- |
| 38 | 2.5.2 |
| 39 | |