* Wed Nov 29 2006 Dan Walsh <dwalsh@redhat.com> 1.33.5-3
- Don't report errors on restorecond when file system does not support XATTRS Resolves: #217694
This commit is contained in:
parent
c5e5d1fec3
commit
9ac2144a22
File diff suppressed because it is too large
Load Diff
@ -4969,6 +4969,35 @@ diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.
|
||||
if (restore_tty_label(fd, ttyn, tty_context, new_tty_context)) {
|
||||
fprintf(stderr, _("Unable to restore tty label...\n"));
|
||||
exit_code = -1;
|
||||
diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.33.5/restorecond/restorecond.c
|
||||
--- nsapolicycoreutils/restorecond/restorecond.c 2006-11-16 17:14:28.000000000 -0500
|
||||
+++ policycoreutils-1.33.5/restorecond/restorecond.c 2006-11-29 12:44:06.000000000 -0500
|
||||
@@ -210,9 +210,10 @@
|
||||
}
|
||||
|
||||
if (fsetfilecon(fd, scontext) < 0) {
|
||||
- syslog(LOG_ERR,
|
||||
- "set context %s->%s failed:'%s'\n",
|
||||
- filename, scontext, strerror(errno));
|
||||
+ if (errno != EOPNOTSUPP)
|
||||
+ syslog(LOG_ERR,
|
||||
+ "set context %s->%s failed:'%s'\n",
|
||||
+ filename, scontext, strerror(errno));
|
||||
if (retcontext >= 0)
|
||||
free(prev_context);
|
||||
free(scontext);
|
||||
@@ -225,8 +226,9 @@
|
||||
if (retcontext >= 0)
|
||||
free(prev_context);
|
||||
} else {
|
||||
- syslog(LOG_ERR, "get context on %s failed: '%s'\n",
|
||||
- filename, strerror(errno));
|
||||
+ if (errno != EOPNOTSUPP)
|
||||
+ syslog(LOG_ERR, "get context on %s failed: '%s'\n",
|
||||
+ filename, strerror(errno));
|
||||
}
|
||||
free(scontext);
|
||||
close(fd);
|
||||
diff --exclude-from=exclude --exclude POTFILES.in --exclude='*.po' --exclude='*.pot' -N -u -r nsapolicycoreutils/run_init/run_init.c policycoreutils-1.33.5/run_init/run_init.c
|
||||
--- nsapolicycoreutils/run_init/run_init.c 2006-11-16 17:14:27.000000000 -0500
|
||||
+++ policycoreutils-1.33.5/run_init/run_init.c 2006-11-28 10:44:03.000000000 -0500
|
||||
|
@ -5,7 +5,7 @@
|
||||
Summary: SELinux policy core utilities.
|
||||
Name: policycoreutils
|
||||
Version: 1.33.5
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: GPL
|
||||
Group: System Environment/Base
|
||||
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
|
||||
@ -168,6 +168,10 @@ fi
|
||||
[ -x /sbin/service ] && /sbin/service restorecond condrestart
|
||||
|
||||
%changelog
|
||||
* Wed Nov 29 2006 Dan Walsh <dwalsh@redhat.com> 1.33.5-3
|
||||
- Don't report errors on restorecond when file system does not support XATTRS
|
||||
Resolves: #217694
|
||||
|
||||
* Tue Nov 28 2006 Dan Walsh <dwalsh@redhat.com> 1.33.5-2
|
||||
- Fix -q qualifier on load_policy
|
||||
Resolves: #214827
|
||||
|
Loading…
Reference in New Issue
Block a user