blob: 469027aacce8e8b87699001a6a9da25c2ed6eaaa [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 31 Mar 2017 19:12:10 -0700
Brad Bishop316dfdd2018-06-25 12:45:53 -04004Subject: [PATCH] Replace __S_IEXEC with S_IEXEC
Brad Bishop6e60e8b2018-02-01 10:27:11 -05005
6S_IEXEC is portable
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -04009
Brad Bishop6e60e8b2018-02-01 10:27:11 -050010---
11 daemon/lookup.c | 4 ++--
12 modules/lookup_multi.c | 2 +-
13 2 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/daemon/lookup.c b/daemon/lookup.c
Brad Bishop316dfdd2018-06-25 12:45:53 -040016index 201ccbb..d821db8 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050017--- a/daemon/lookup.c
18+++ b/daemon/lookup.c
Brad Bishop316dfdd2018-06-25 12:45:53 -040019@@ -366,7 +366,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
Brad Bishop6e60e8b2018-02-01 10:27:11 -050020 if (!S_ISREG(st.st_mode))
21 return NSS_STATUS_NOTFOUND;
22
23- if (st.st_mode & __S_IEXEC)
24+ if (st.st_mode & S_IEXEC)
25 type = src_prog;
26 else
27 type = src_file;
Brad Bishop316dfdd2018-06-25 12:45:53 -040028@@ -856,7 +856,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029 if (!S_ISREG(st.st_mode))
30 return NSS_STATUS_NOTFOUND;
31
32- if (st.st_mode & __S_IEXEC)
33+ if (st.st_mode & S_IEXEC)
34 type = src_prog;
35 else
36 type = src_file;
37diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
Brad Bishop316dfdd2018-06-25 12:45:53 -040038index fadd2ea..3ecda6d 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050039--- a/modules/lookup_multi.c
40+++ b/modules/lookup_multi.c
Brad Bishop316dfdd2018-06-25 12:45:53 -040041@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch
Brad Bishop6e60e8b2018-02-01 10:27:11 -050042 continue;
43 }
44
45- if (st.st_mode & __S_IEXEC)
46+ if (st.st_mode & S_IEXEC)
47 type = src_prog;
48 else
49 type = src_file;