From: Sam James <sam@xxxxxxxxxx> Tested-by: Yixun Lan <dlan@xxxxxxxxxx> Signed-off-by: Sam James <sam@xxxxxxxxxx> --- CHANGELOG | 1 + daemon/lookup.c | 6 +++--- modules/lookup_multi.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6f53e597..1a126350 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ - fix bashism in configure. - musl: fix missing include in hash.h. - musl: define fallback dummy NSS config path +- musl: avoid internal stat.h definitions. 19/10/2021 autofs-5.1.8 - add xdr_exports(). diff --git a/daemon/lookup.c b/daemon/lookup.c index 0b281f83..4a286d6b 100644 --- a/daemon/lookup.c +++ b/daemon/lookup.c @@ -397,7 +397,7 @@ static int read_file_source_instance(struct autofs_point *ap, struct map_source return NSS_STATUS_NOTFOUND; } - if (st.st_mode & __S_IEXEC) + if (st.st_mode & S_IEXEC) type = src_prog; else type = src_file; @@ -930,7 +930,7 @@ static int lookup_name_file_source_instance(struct autofs_point *ap, struct map_ return NSS_STATUS_NOTFOUND; } - if (st.st_mode & __S_IEXEC) + if (st.st_mode & S_IEXEC) type = src_prog; else type = src_file; @@ -1077,7 +1077,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 fadd2ea6..cf109de9 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; @@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt, continue; } - if (st.st_mode & __S_IEXEC) + if (st.st_mode & S_IEXEC) type = src_prog; else type = src_file;
