summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch b/meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch
deleted file mode 100644
index 518c05b73a..0000000000
--- a/meta/recipes-core/systemd/systemd/0005-basic-user-util-properly-protect-use-of-gshadow.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 66a5b5ce9b991327d594f7b635de16999ca54093 Mon Sep 17 00:00:00 2001
2From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3Date: Wed, 21 Nov 2018 18:09:04 +0100
4Subject: basic/user-util: properly protect use of gshadow
5
6Commit 100d5f6ee6 (user-util: add new wrappers for [...] database
7files), ammended by commit 4f07ffa8f5 (Use #if instead of #ifdef for
8ENABLE_GSHADOW) moved code from sysuser to basic/user-util.
9
10In doing so, the combination of both commits properly propagated the
11ENABLE_GSHADOW conditions around the function manipulating gshadow, but
12they forgot to protect the inclusion of the gshadow.h header.
13
14Fix that to be able to build on C libraries that do not provide gshadow
15(e.g. uClibc-ng, where it does not exist.)
16
17Upstream-Status: Backport [https://github.com/systemd/systemd/commit/66a5b5ce9b991327d594f7b635de16999ca54093]
18---
19 src/basic/user-util.h | 2 ++
20 1 file changed, 2 insertions(+)
21
22diff --git a/src/basic/user-util.h b/src/basic/user-util.h
23index b6de0e423..cc899ee76 100644
24--- a/src/basic/user-util.h
25+++ b/src/basic/user-util.h
26@@ -2,7 +2,9 @@
27 #pragma once
28
29 #include <grp.h>
30+#if ENABLE_GSHADOW
31 #include <gshadow.h>
32+#endif
33 #include <pwd.h>
34 #include <shadow.h>
35 #include <stdbool.h>
36--
372.18.1
38