diff options
Diffstat (limited to 'meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch')
-rw-r--r-- | meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch index 469027aac..e7fdd10aa 100644 --- a/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ b/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch | |||
@@ -1,22 +1,26 @@ | |||
1 | From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 00:00:00 2001 | 1 | From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Fri, 31 Mar 2017 19:12:10 -0700 | 3 | Date: Tue, 27 Nov 2018 16:52:35 +0800 |
4 | Subject: [PATCH] Replace __S_IEXEC with S_IEXEC | 4 | Subject: [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 | ||
5 | 7 | ||
6 | S_IEXEC is portable | 8 | S_IEXEC is portable |
7 | 9 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | 11 | ||
12 | update patch to version 5.1.5 | ||
13 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
10 | --- | 14 | --- |
11 | daemon/lookup.c | 4 ++-- | 15 | daemon/lookup.c | 6 +++--- |
12 | modules/lookup_multi.c | 2 +- | 16 | modules/lookup_multi.c | 2 +- |
13 | 2 files changed, 3 insertions(+), 3 deletions(-) | 17 | 2 files changed, 4 insertions(+), 4 deletions(-) |
14 | 18 | ||
15 | diff --git a/daemon/lookup.c b/daemon/lookup.c | 19 | diff --git a/daemon/lookup.c b/daemon/lookup.c |
16 | index 201ccbb..d821db8 100644 | 20 | index 18df935..d35d484 100644 |
17 | --- a/daemon/lookup.c | 21 | --- a/daemon/lookup.c |
18 | +++ b/daemon/lookup.c | 22 | +++ b/daemon/lookup.c |
19 | @@ -366,7 +366,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source | 23 | @@ -382,7 +382,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source |
20 | if (!S_ISREG(st.st_mode)) | 24 | if (!S_ISREG(st.st_mode)) |
21 | return NSS_STATUS_NOTFOUND; | 25 | return NSS_STATUS_NOTFOUND; |
22 | 26 | ||
@@ -25,7 +29,7 @@ index 201ccbb..d821db8 100644 | |||
25 | type = src_prog; | 29 | type = src_prog; |
26 | else | 30 | else |
27 | type = src_file; | 31 | type = src_file; |
28 | @@ -856,7 +856,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ | 32 | @@ -942,7 +942,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ |
29 | if (!S_ISREG(st.st_mode)) | 33 | if (!S_ISREG(st.st_mode)) |
30 | return NSS_STATUS_NOTFOUND; | 34 | return NSS_STATUS_NOTFOUND; |
31 | 35 | ||
@@ -34,8 +38,17 @@ index 201ccbb..d821db8 100644 | |||
34 | type = src_prog; | 38 | type = src_prog; |
35 | else | 39 | else |
36 | type = src_file; | 40 | type = src_file; |
41 | @@ -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"; | ||
37 | diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c | 50 | diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c |
38 | index fadd2ea..3ecda6d 100644 | 51 | index bb9f88c..cf109de 100644 |
39 | --- a/modules/lookup_multi.c | 52 | --- a/modules/lookup_multi.c |
40 | +++ b/modules/lookup_multi.c | 53 | +++ b/modules/lookup_multi.c |
41 | @@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch | 54 | @@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_lookup(const char *format, int argc, const ch |
@@ -47,3 +60,6 @@ index fadd2ea..3ecda6d 100644 | |||
47 | type = src_prog; | 60 | type = src_prog; |
48 | else | 61 | else |
49 | type = src_file; | 62 | type = src_file; |
63 | -- | ||
64 | 2.7.4 | ||
65 | |||