| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 8fd74ddb3369572c594b22b396346131af00faee Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 31 Mar 2017 19:12:10 -0700 |
| 4 | Subject: [PATCH 2/2] Replace __S_IEXEC with S_IEXEC |
| 5 | |
| 6 | S_IEXEC is portable |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | daemon/lookup.c | 4 ++-- |
| 11 | modules/lookup_multi.c | 2 +- |
| 12 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 13 | |
| 14 | diff --git a/daemon/lookup.c b/daemon/lookup.c |
| 15 | index 62071df..1bec97f 100644 |
| 16 | --- a/daemon/lookup.c |
| 17 | +++ b/daemon/lookup.c |
| 18 | @@ -400,7 +400,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source |
| 19 | if (!S_ISREG(st.st_mode)) |
| 20 | return NSS_STATUS_NOTFOUND; |
| 21 | |
| 22 | - if (st.st_mode & __S_IEXEC) |
| 23 | + if (st.st_mode & S_IEXEC) |
| 24 | type = src_prog; |
| 25 | else |
| 26 | type = src_file; |
| 27 | @@ -890,7 +890,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ |
| 28 | if (!S_ISREG(st.st_mode)) |
| 29 | return NSS_STATUS_NOTFOUND; |
| 30 | |
| 31 | - if (st.st_mode & __S_IEXEC) |
| 32 | + if (st.st_mode & S_IEXEC) |
| 33 | type = src_prog; |
| 34 | else |
| 35 | type = src_file; |
| 36 | diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c |
| 37 | index 6ec8434..88d081f 100644 |
| 38 | --- a/modules/lookup_multi.c |
| 39 | +++ b/modules/lookup_multi.c |
| 40 | @@ -104,7 +104,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch |
| 41 | continue; |
| 42 | } |
| 43 | |
| 44 | - if (st.st_mode & __S_IEXEC) |
| 45 | + if (st.st_mode & S_IEXEC) |
| 46 | type = src_prog; |
| 47 | else |
| 48 | type = src_file; |
| 49 | -- |
| 50 | 2.12.1 |
| 51 | |