* Thu Nov 18 2004 Dan Walsh <dwalsh@redhat.com> 1.18.1-2

- Fix run_init.8 to refer to correct location of initrc_context
This commit is contained in:
Daniel J Walsh 2004-11-18 15:20:19 +00:00
parent 85196f1e13
commit e03c046cd0
2 changed files with 24 additions and 27 deletions

View File

@ -1,26 +1,18 @@
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.17.7/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow 2004-09-10 11:25:57.000000000 -0400
+++ policycoreutils-1.17.7/audit2allow/audit2allow 2004-10-28 10:34:33.476265420 -0400
@@ -124,13 +124,19 @@
foreach $k (sort keys %rules)
{
my ($a,$scontext,$tcontext,$tclass) = split /\|/, $k;
- print OUT "allow $scontext $tcontext:$tclass {";
+ if ($scontext eq $tcontext) {
+ $tcontext = 'self';
+ }
+ print OUT "allow $scontext $tcontext:$tclass";
my $access_types = $rules{$k};
+ $len=(keys %$access_types);
+ if ($len gt 2 ) { print OUT " {"; }
foreach $t (sort keys %$access_types) {
- print OUT "$t ";
+ if ($t ne "") {print OUT " $t";}
}
- print OUT "};\n";
+ if ($len gt 2 ) { print OUT " }"; }
+ print OUT ";\n";
$occur{$k} =~ s/\\(.)/$1/g; # de-escape string
print OUT "$occur{$k}\n" if ($verbose);
}
--- policycoreutils-1.18.1/run_init/run_init.8.rhat 2004-11-18 10:14:17.199692027 -0500
+++ policycoreutils-1.18.1/run_init/run_init.8 2004-11-18 10:18:07.608694841 -0500
@@ -8,13 +8,13 @@
.SH DESCRIPTION
.PP
Run a init script under the proper context, which is specified in
-/etc/security/initrc_context.
+/etc/selinux/POLICYTYPE/contexts/initrc_context.
.SH FILES
/etc/passwd - user account information
.br
/etc/shadow - encrypted passwords and age information
.br
-/etc/security/initrc_context - contains the context to run init scripts under
+/etc/selinux/POLICYTYPE/contexts/initrc_context - contains the context to run init scripts under
.SH SEE ALSO
.B newrole
(1),

View File

@ -1,10 +1,11 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.18.1
Release: 1
Release: 2
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
Patch: policycoreutils-rhat.patch
Prefix: %{_prefix}
BuildRequires: libselinux-devel >= 1.15.3 pam-devel libsepol-devel >= 1.1.1
@ -31,6 +32,7 @@ context.
%prep
%setup -q
%patch -p1 -b .rhat
%build
make CFLAGS="%{optflags}" all
@ -75,6 +77,9 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog
* Thu Nov 18 2004 Dan Walsh <dwalsh@redhat.com> 1.18.1-2
- Fix run_init.8 to refer to correct location of initrc_context
* Wed Nov 3 2004 Dan Walsh <dwalsh@redhat.com> 1.18.1-1
- Upgrade to latest from NSA