RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libsemanage: save homedir_template in the policy store for genhomedircon 

We don't currently store homedir_template in the policy store, which
means genhomedircon only has a template file to use if the
homedir_template was generated from the file contexts in the same
transaction.  But homedir_template isn't always generated, as in the
case with setsebool -P. In this and other cases, genhomedircon will not
have a template file resulting in an empty file_contexts.homedir file.

This commit changes this so that homedir_template is always stored in
the policy store so it can be used by genhomedircon regardless of how
policy was built. Also add the homedir_template file to the migration
script.

Signed-off by: Steve Lawrence <slawrence@tresys.com>
Acked-by:  Stephen Smalley <sds@tycho.nsa.gov>
This commit is contained in:
Steve Lawrence 2015-09-03 09:28:08 -04:00
parent fbcc08ab2a
commit 75dd8c062d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsemanage/src/direct_api.c
View File

@ -1415,7 +1415,6 @@ static int semanage_direct_commit(semanage_handle_t * sh)
/* remove files that are automatically generated and no longer needed */
unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL));
unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_HOMEDIR_TMPL));
unlink(semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA));
if (sh->do_rebuild || modified || bools_modified || fcontexts_modified) {

3
libsemanage/utils/semanage_migrate_store
View File

@ -251,7 +251,8 @@ if __name__ == "__main__":
"disable_dontaudit",
"preserve_tunables",
"policy.kern",
"file_contexts"]
"file_contexts",
"homedir_template"]
create_dir(newroot_path(), 0o755)