diff options
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] | |||
4 | 4 | ||
5 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 5 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
6 | --- | 6 | --- |
7 | src/useradd.c | 82 +++++++++++++++++++++++++++++++++++++++-------------------- | 7 | src/useradd.c | 80 +++++++++++++++++++++++++++++++++++++++-------------------- |
8 | 1 file changed, 54 insertions(+), 28 deletions(-) | 8 | 1 file changed, 53 insertions(+), 27 deletions(-) |
9 | 9 | ||
10 | diff --git a/src/useradd.c b/src/useradd.c | 10 | diff --git a/src/useradd.c b/src/useradd.c |
11 | index 7214e72..3aaf45c 100644 | 11 | index 00a3c30..9ecbb58 100644 |
12 | --- a/src/useradd.c | 12 | --- a/src/useradd.c |
13 | +++ b/src/useradd.c | 13 | +++ b/src/useradd.c |
14 | @@ -2021,6 +2021,35 @@ static void usr_update (void) | 14 | @@ -2021,6 +2021,35 @@ static void usr_update (void) |
@@ -47,7 +47,7 @@ index 7214e72..3aaf45c 100644 | |||
47 | * create_home - create the user's home directory | 47 | * create_home - create the user's home directory |
48 | * | 48 | * |
49 | * create_home() creates the user's home directory if it does not | 49 | * create_home() creates the user's home directory if it does not |
50 | @@ -2038,42 +2067,39 @@ static void create_home (void) | 50 | @@ -2038,39 +2067,36 @@ static void create_home (void) |
51 | fail_exit (E_HOMEDIR); | 51 | fail_exit (E_HOMEDIR); |
52 | } | 52 | } |
53 | #endif | 53 | #endif |
@@ -74,16 +74,12 @@ index 7214e72..3aaf45c 100644 | |||
74 | - (void) chown (prefix_user_home, user_id, user_gid); | 74 | - (void) chown (prefix_user_home, user_id, user_gid); |
75 | - chmod (prefix_user_home, | 75 | - chmod (prefix_user_home, |
76 | - 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); | 76 | - 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); |
77 | - home_added = true; | ||
77 | + fail_exit (E_HOMEDIR); | 78 | + fail_exit (E_HOMEDIR); |
78 | + } | 79 | + } |
79 | + (void) chown (prefix_user_home, user_id, user_gid); | 80 | + (void) chown (prefix_user_home, user_id, user_gid); |
80 | + chmod (prefix_user_home, | 81 | + chmod (prefix_user_home, |
81 | + 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); | 82 | + 0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK)); |
82 | #ifdef WITH_ATTR | ||
83 | - attr_copy_file (def_template, user_home, NULL, NULL); | ||
84 | + attr_copy_file (def_template, user_home, NULL, NULL); | ||
85 | #endif | ||
86 | - home_added = true; | ||
87 | + home_added = true; | 83 | + home_added = true; |
88 | #ifdef WITH_AUDIT | 84 | #ifdef WITH_AUDIT |
89 | - audit_logger (AUDIT_ADD_USER, Prog, | 85 | - audit_logger (AUDIT_ADD_USER, Prog, |