rpms/libsemanage
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Make sure /root is not used in genhomedircon

Browse Source
This commit is contained in:
Daniel J Walsh 2009-08-26 19:06:23 +00:00
parent 168ea7cab1
commit 7313e2e746
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libsemanage-rhat.patch
View File

@ -1,7 +1,7 @@
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.33/src/genhomedircon.c diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.35/src/genhomedircon.c
--- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400 --- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400
+++ libsemanage-2.0.33/src/genhomedircon.c 2009-07-15 10:32:20.000000000 -0400 +++ libsemanage-2.0.35/src/genhomedircon.c 2009-08-26 15:05:01.000000000 -0400
@@ -304,6 +304,10 @@ @@ -304,10 +304,20 @@
continue; continue;
if (!semanage_list_find(shells, pwbuf->pw_shell)) if (!semanage_list_find(shells, pwbuf->pw_shell))
continue; continue;
@ -12,7 +12,17 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman
if (strcmp(pwbuf->pw_dir, "/") == 0) if (strcmp(pwbuf->pw_dir, "/") == 0)
continue; continue;
if (semanage_str_count(pwbuf->pw_dir, '/') <= 1) if (semanage_str_count(pwbuf->pw_dir, '/') <= 1)
@@ -794,6 +798,11 @@ continue;
+
+ if (strcmp(pwbuf->pw_dir, "/root") == 0) {
+ /* don't relabel /root*/
+ continue;
+ }
+
if (!(path = strdup(pwbuf->pw_dir))) {
break;
}
@@ -794,6 +804,11 @@
* /root */ * /root */
continue; continue;
} }
@ -24,9 +34,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman
if (push_user_entry(&head, name, seuname, if (push_user_entry(&head, name, seuname,
prefix, pwent->pw_dir) != STATUS_SUCCESS) { prefix, pwent->pw_dir) != STATUS_SUCCESS) {
*errors = STATUS_ERR; *errors = STATUS_ERR;
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.33/src/semanage.conf diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.35/src/semanage.conf
--- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400 --- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400
+++ libsemanage-2.0.33/src/semanage.conf 2009-07-15 10:30:33.000000000 -0400 +++ libsemanage-2.0.35/src/semanage.conf 2009-08-05 15:21:56.000000000 -0400
@@ -35,4 +35,4 @@ @@ -35,4 +35,4 @@
# given in <sepol/policydb.h>. Change this setting if a different # given in <sepol/policydb.h>. Change this setting if a different
# version is necessary. # version is necessary.

5
libsemanage.spec
View File

@ -3,7 +3,7 @@
Summary: SELinux binary policy manipulation library Summary: SELinux binary policy manipulation library
Name: libsemanage Name: libsemanage
Version: 2.0.35 Version: 2.0.35
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@ -91,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/python*/site-packages/* %{_libdir}/python*/site-packages/*
%changelog %changelog
* Wed Aug 26 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.35-2
- Make sure /root is not used in genhomedircon
* Wed Aug 5 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.35-1 * Wed Aug 5 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.35-1
* Revert hard linking of files between tmp/active/previous. * Revert hard linking of files between tmp/active/previous.
* Enable configuration of bzip behavior from Stephen Smalley. * Enable configuration of bzip behavior from Stephen Smalley.