* Thu Sep 7 2006 Dan Walsh <dwalsh@redhat.com> 1.30.28-5

- Put back Erich's change
This commit is contained in:
Daniel J Walsh 2006-09-07 13:31:34 +00:00
parent 52a6c1e8f8
commit 524f29009b
2 changed files with 4 additions and 15 deletions

View File

@ -4389,20 +4389,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c
fprintf(stderr, "lstat(%s) failed: %s\n", filename,
strerror(errno));
return 1;
@@ -197,11 +201,8 @@
return 1;
}
p += len;
- /* ensure trailing slash of directory name */
- if (len == 0 || *(p - 1) != '/') {
- *p = '/';
- p++;
- }
+ *p = '/';
+ p++;
strcpy(p, file_sep);
filename = path;
} else {
@@ -322,6 +323,8 @@
close(pipe_fds[1]);
if (rc == -1 || rc > 0) {

View File

@ -5,7 +5,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 1.30.28
Release: 4
Release: 5
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -119,6 +119,9 @@ fi
[ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog
* Thu Sep 7 2006 Dan Walsh <dwalsh@redhat.com> 1.30.28-5
- Put back Erich's change
* Wed Sep 6 2006 Dan Walsh <dwalsh@redhat.com> 1.30.28-4
- Remove recursive switch when using rpm