emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

useradd: create directories after the SELinux user

Browse Source 
Create the home and mail folders after the SELinux user has been set for
the added user. This will allow the folders to be created with the
SELinux user label.

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa
2021-10-08 13:09:59 +02:00
parent 6be18d45e1
commit 09c752f00f
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/useradd.c
View File

@ -2670,27 +2670,12 @@ int main (int argc, char **argv)
usr_update (subuid_count, subgid_count); usr_update (subuid_count, subgid_count);
if (mflg) {
create_home ();
if (home_added) {
copy_tree (def_template, prefix_user_home, false, false,
(uid_t)-1, user_id, (gid_t)-1, user_gid);
} else {
fprintf (stderr,
_("%s: warning: the home directory %s already exists.\n"
"%s: Not copying any file from skel directory into it.\n"),
Prog, user_home, Prog);
}
}
/* Do not create mail directory for system accounts */
if (!rflg) {
create_mail ();
}
close_files (); close_files ();
nscd_flush_cache ("passwd");
nscd_flush_cache ("group");
sssd_flush_cache (SSSD_DB_PASSWD | SSSD_DB_GROUP);
/* /*
* tallylog_reset needs to be able to lookup * tallylog_reset needs to be able to lookup
* a valid existing user name, * a valid existing user name,
@ -2716,15 +2701,30 @@ int main (int argc, char **argv)
} }
#endif /* WITH_SELINUX */ #endif /* WITH_SELINUX */
if (mflg) {
create_home ();
if (home_added) {
copy_tree (def_template, prefix_user_home, false, false,
(uid_t)-1, user_id, (gid_t)-1, user_gid);
} else {
fprintf (stderr,
_("%s: warning: the home directory %s already exists.\n"
"%s: Not copying any file from skel directory into it.\n"),
Prog, user_home, Prog);
}
}
/* Do not create mail directory for system accounts */
if (!rflg) {
create_mail ();
}
if (run_parts ("/etc/shadow-maint/useradd-post.d", (char*)user_name, if (run_parts ("/etc/shadow-maint/useradd-post.d", (char*)user_name,
"useradd")) { "useradd")) {
exit(1); exit(1);
} }
nscd_flush_cache ("passwd");
nscd_flush_cache ("group");
sssd_flush_cache (SSSD_DB_PASSWD | SSSD_DB_GROUP);
return E_SUCCESS; return E_SUCCESS;
} }