diff options
-rw-r--r-- | meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch | 27 | ||||
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 2 |
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch b/meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch new file mode 100644 index 0000000000..21c9a1415c --- /dev/null +++ b/meta/recipes-extended/shadow/files/0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 11290e897a49adddee215833944a518443d9b0d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Gherzan <andrei.gherzan@huawei.com> | ||
3 | Date: Wed, 24 Aug 2022 00:54:47 +0200 | ||
4 | Subject: [PATCH] Drop nsswitch.conf message when not in place - eg. musl | ||
5 | |||
6 | Upstream-Status: Inappropriate [issue reported at https://github.com/shadow-maint/shadow/issues/557] | ||
7 | Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> | ||
8 | --- | ||
9 | lib/nss.c | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/lib/nss.c b/lib/nss.c | ||
13 | index 06fa48e..44245da 100644 | ||
14 | --- a/lib/nss.c | ||
15 | +++ b/lib/nss.c | ||
16 | @@ -59,7 +59,7 @@ void nss_init(const char *nsswitch_path) { | ||
17 | // subid: files | ||
18 | nssfp = fopen(nsswitch_path, "r"); | ||
19 | if (!nssfp) { | ||
20 | - fprintf(shadow_logfd, "Failed opening %s: %m\n", nsswitch_path); | ||
21 | + //fprintf(shadow_logfd, "Failed opening %s: %m\n", nsswitch_path); | ||
22 | atomic_store(&nss_init_completed, true); | ||
23 | return; | ||
24 | } | ||
25 | -- | ||
26 | 2.25.1 | ||
27 | |||
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index b2f82e9ac7..414bf467ba 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -25,12 +25,14 @@ SRC_URI:append:class-target = " \ | |||
25 | SRC_URI:append:class-native = " \ | 25 | SRC_URI:append:class-native = " \ |
26 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ | 26 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ |
27 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ | 27 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ |
28 | file://0001-Drop-nsswitch.conf-message-when-not-in-place-eg.-musl.patch \ | ||
28 | " | 29 | " |
29 | SRC_URI:append:class-nativesdk = " \ | 30 | SRC_URI:append:class-nativesdk = " \ |
30 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ | 31 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ |
31 | " | 32 | " |
32 | SRC_URI[sha256sum] = "9fdb73b5d2b44e8ba9fcee1b4493ac75dd5040bda35b9ac8b06570cd192e7ee3" | 33 | SRC_URI[sha256sum] = "9fdb73b5d2b44e8ba9fcee1b4493ac75dd5040bda35b9ac8b06570cd192e7ee3" |
33 | 34 | ||
35 | |||
34 | # Additional Policy files for PAM | 36 | # Additional Policy files for PAM |
35 | PAM_SRC_URI = "file://pam.d/chfn \ | 37 | PAM_SRC_URI = "file://pam.d/chfn \ |
36 | file://pam.d/chpasswd \ | 38 | file://pam.d/chpasswd \ |