diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2019-03-13 11:26:31 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-18 11:09:55 +0000 |
| commit | 2a8b35226edde4cd49cb5ba68c5b47aa8379eca1 (patch) | |
| tree | a1c9bff9a8b98488f6a3ad60cc2f1f43017b915a /meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch | |
| parent | 57154e8f8e65db82c5b75dc10635db308b525820 (diff) | |
| download | openembedded-core-contrib-2a8b35226edde4cd49cb5ba68c5b47aa8379eca1.tar.gz | |
shadow: drop inappropriate patch
The 0001-useradd-copy-extended-attributes-of-home.patch (oe-core commit:
eed66e85af5ca6bbdd80cc3d5cf8453e8d8880bc) introduced a runtime failure
when enable SELinux.
When enable SELinux, The directory /home/user will get the extended
attributes of /etc/skel. However, the SELinux lable for /etc/skel is
etc_t which is also copied to /home/user. It will cause the user can not
write their home directory because the SELinux lable for /home/user
should be user_home_dir_t.
See discussion: http://lists.openembedded.org/pipermail/openembedded-core/2018-January/146039.html
The solution at the moment is to drop this patch.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch')
| -rw-r--r-- | meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch b/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch index 7024136593..faa6f68ebe 100644 --- a/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch +++ b/meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch @@ -4,11 +4,11 @@ Upstream-Status: Inappropriate [OE specific] Signed-off-by: Chen Qi <Qi.Chen@windriver.com> --- - src/useradd.c | 82 +++++++++++++++++++++++++++++++++++++++-------------------- - 1 file changed, 54 insertions(+), 28 deletions(-) + src/useradd.c | 80 +++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 53 insertions(+), 27 deletions(-) diff --git a/src/useradd.c b/src/useradd.c -index 7214e72..3aaf45c 100644 +index 00a3c30..9ecbb58 100644 --- a/src/useradd.c +++ b/src/useradd.c @@ -2021,6 +2021,35 @@ static void usr_update (void) @@ -47,7 +47,7 @@ index 7214e72..3aaf45c 100644 * create_home - create the user's home directory * * create_home() creates the user's home directory if it does not -@@ -2038,42 +2067,39 @@ static void create_home (void) +@@ -2038,39 +2067,36 @@ static void create_home (void) fail_exit (E_HOMEDIR); } #endif @@ -74,16 +74,12 @@ index 7214e72..3aaf45c 100644 - (void) chown (prefix_user_home, user_id, user_gid); - chmod (prefix_user_home, - 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); +- home_added = true; + fail_exit (E_HOMEDIR); + } + (void) chown (prefix_user_home, user_id, user_gid); + chmod (prefix_user_home, + 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); - #ifdef WITH_ATTR -- attr_copy_file (def_template, user_home, NULL, NULL); -+ attr_copy_file (def_template, user_home, NULL, NULL); - #endif -- home_added = true; + home_added = true; #ifdef WITH_AUDIT - audit_logger (AUDIT_ADD_USER, Prog, |