- Put check for /root back into genhomedircon

This commit is contained in:
Daniel J Walsh 2009-07-10 18:46:52 +00:00
parent f4a5c19066
commit 1639efd7cd
3 changed files with 25 additions and 8 deletions

View File

@ -1,16 +1,30 @@
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.32/src/semanage.conf
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.33/src/genhomedircon.c
--- nsalibsemanage/src/genhomedircon.c 2008-08-28 09:34:24.000000000 -0400
+++ libsemanage-2.0.33/src/genhomedircon.c 2009-07-10 14:46:05.000000000 -0400
@@ -794,6 +794,10 @@
* /root */
continue;
}
+ if (strcmp(pwent->pw_dir, "/root") == 0) {
+ /* don't relabel /root*/
+ continue;
+ }
if (push_user_entry(&head, name, seuname,
prefix, pwent->pw_dir) != STATUS_SUCCESS) {
*errors = STATUS_ERR;
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.33/src/semanage.conf
--- nsalibsemanage/src/semanage.conf 2008-08-28 09:34:24.000000000 -0400
+++ libsemanage-2.0.32/src/semanage.conf 2009-07-01 11:15:30.000000000 -0400
+++ libsemanage-2.0.33/src/semanage.conf 2009-07-10 14:45:44.000000000 -0400
@@ -35,4 +35,4 @@
# given in <sepol/policydb.h>. Change this setting if a different
# version is necessary.
#policy-version = 19
-
+expand-check=0
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.32/src/semanage_store.c
diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.33/src/semanage_store.c
--- nsalibsemanage/src/semanage_store.c 2009-07-07 15:32:32.000000000 -0400
+++ libsemanage-2.0.32/src/semanage_store.c 2009-07-01 11:42:07.000000000 -0400
@@ -441,8 +440,6 @@
+++ libsemanage-2.0.33/src/semanage_store.c 2009-07-10 14:45:44.000000000 -0400
@@ -441,8 +441,6 @@
char tmp[PATH_MAX];
char buf[4192];
@ -19,7 +33,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsema
n = snprintf(tmp, PATH_MAX, "%s.tmp", dst);
if (n < 0 || n >= PATH_MAX)
return -1;
@@ -510,7 +507,8 @@
@@ -510,7 +508,8 @@
goto cleanup;
}
} else if (S_ISREG(sb.st_mode)) {

View File

@ -3,7 +3,7 @@
Summary: SELinux binary policy manipulation library
Name: libsemanage
Version: 2.0.33
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@ -91,6 +91,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/python*/site-packages/*
%changelog
* Fri Jul 10 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.33-2
- Put check for /root back into genhomedircon
* Tue Jul 7 2009 Dan Walsh <dwalsh@redhat.com> - 2.0.33-1
- Update to upstream

View File

@ -1 +1 @@
9e4c56068457e7ffa60df8d8b8095a8a libsemanage-2.0.33.tgz
3c5af39fda8e81567f0c6d4bf96cfc7f libsemanage-2.0.33.tgz