blob: e7fdd10aabd4afd606118818b7d068495eaf10db [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 27 Nov 2018 16:52:35 +0800
4Subject: [PATCH] From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17
5 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017
6 19:12:10 -0700 Subject: [PATCH] Replace __S_IEXEC with S_IEXEC
Brad Bishop6e60e8b2018-02-01 10:27:11 -05007
8S_IEXEC is portable
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
Brad Bishop316dfdd2018-06-25 12:45:53 -040011
Brad Bishop19323692019-04-05 15:28:33 -040012update patch to version 5.1.5
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
Brad Bishop6e60e8b2018-02-01 10:27:11 -050014---
Brad Bishop19323692019-04-05 15:28:33 -040015 daemon/lookup.c | 6 +++---
Brad Bishop6e60e8b2018-02-01 10:27:11 -050016 modules/lookup_multi.c | 2 +-
Brad Bishop19323692019-04-05 15:28:33 -040017 2 files changed, 4 insertions(+), 4 deletions(-)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050018
19diff --git a/daemon/lookup.c b/daemon/lookup.c
Brad Bishop19323692019-04-05 15:28:33 -040020index 18df935..d35d484 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050021--- a/daemon/lookup.c
22+++ b/daemon/lookup.c
Brad Bishop19323692019-04-05 15:28:33 -040023@@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source
Brad Bishop6e60e8b2018-02-01 10:27:11 -050024 if (!S_ISREG(st.st_mode))
25 return NSS_STATUS_NOTFOUND;
26
27- if (st.st_mode & __S_IEXEC)
28+ if (st.st_mode & S_IEXEC)
29 type = src_prog;
30 else
31 type = src_file;
Brad Bishop19323692019-04-05 15:28:33 -040032@@ -942,7 +942,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_
Brad Bishop6e60e8b2018-02-01 10:27:11 -050033 if (!S_ISREG(st.st_mode))
34 return NSS_STATUS_NOTFOUND;
35
36- if (st.st_mode & __S_IEXEC)
37+ if (st.st_mode & S_IEXEC)
38 type = src_prog;
39 else
40 type = src_file;
Brad Bishop19323692019-04-05 15:28:33 -040041@@ -1118,7 +1118,7 @@ static struct map_source *lookup_get_map_source(struct master_mapent *entry)
42 if (!S_ISREG(st.st_mode))
43 return NULL;
44
45- if (st.st_mode & __S_IEXEC)
46+ if (st.st_mode & S_IEXEC)
47 type = "program";
48 else
49 type = "file";
Brad Bishop6e60e8b2018-02-01 10:27:11 -050050diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c
Brad Bishop19323692019-04-05 15:28:33 -040051index bb9f88c..cf109de 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050052--- a/modules/lookup_multi.c
53+++ b/modules/lookup_multi.c
Brad Bishop316dfdd2018-06-25 12:45:53 -040054@@ -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 -050055 continue;
56 }
57
58- if (st.st_mode & __S_IEXEC)
59+ if (st.st_mode & S_IEXEC)
60 type = src_prog;
61 else
62 type = src_file;
Brad Bishop19323692019-04-05 15:28:33 -040063--
642.7.4
65