| From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001 |
| From: Changqing Li <changqing.li@windriver.com> |
| Date: Tue, 27 Nov 2018 16:52:35 +0800 |
| Subject: [PATCH] From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 |
| 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 |
| 19:12:10 -0700 Subject: [PATCH] Replace __S_IEXEC with S_IEXEC |
| |
| S_IEXEC is portable |
| |
| Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| |
| update patch to version 5.1.5 |
| Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| --- |
| daemon/lookup.c | 6 +++--- |
| modules/lookup_multi.c | 2 +- |
| 2 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/daemon/lookup.c b/daemon/lookup.c |
| index 18df935..d35d484 100644 |
| --- a/daemon/lookup.c |
| +++ b/daemon/lookup.c |
| @@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source |
| if (!S_ISREG(st.st_mode)) |
| return NSS_STATUS_NOTFOUND; |
| |
| - if (st.st_mode & __S_IEXEC) |
| + if (st.st_mode & S_IEXEC) |
| type = src_prog; |
| else |
| type = src_file; |
| @@ -942,7 +942,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ |
| if (!S_ISREG(st.st_mode)) |
| return NSS_STATUS_NOTFOUND; |
| |
| - if (st.st_mode & __S_IEXEC) |
| + if (st.st_mode & S_IEXEC) |
| type = src_prog; |
| else |
| type = src_file; |
| @@ -1118,7 +1118,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry) |
| if (!S_ISREG(st.st_mode)) |
| return NULL; |
| |
| - if (st.st_mode & __S_IEXEC) |
| + if (st.st_mode & S_IEXEC) |
| type = "program"; |
| else |
| type = "file"; |
| diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c |
| index bb9f88c..cf109de 100644 |
| --- a/modules/lookup_multi.c |
| +++ b/modules/lookup_multi.c |
| @@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch |
| continue; |
| } |
| |
| - if (st.st_mode & __S_IEXEC) |
| + if (st.st_mode & S_IEXEC) |
| type = src_prog; |
| else |
| type = src_file; |
| -- |
| 2.7.4 |
| |