- Fix avcstat to clear totals

This commit is contained in:
Daniel J Walsh 2005-05-11 15:00:11 +00:00
parent 8371f522b4
commit 8456bc124a
2 changed files with 18 additions and 19 deletions

View File

@ -1,6 +1,5 @@
diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinux.8 libselinux-1.23.10/man/man8/selinux.8
--- nsalibselinux/man/man8/selinux.8 2004-11-02 14:26:19.000000000 -0500
+++ libselinux-1.23.10/man/man8/selinux.8 2005-05-11 10:34:11.000000000 -0400
--- libselinux-1.23.10/man/man8/selinux.8.rhat 2005-04-29 14:07:14.000000000 -0400
+++ libselinux-1.23.10/man/man8/selinux.8 2005-05-11 10:56:10.000000000 -0400
@@ -1,4 +1,4 @@
-.TH "selinux" "8" "11 Aug 2004" "dwalsh@redhat.com" "SELinux Command Line documentation"
+.TH "selinux" "8" "29 Apr 2005" "dwalsh@redhat.com" "SELinux Command Line documentation"
@ -31,11 +30,9 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/man/man8/selinux.8 libselinux
.SH FILES
/etc/selinux/config
Binary files nsalibselinux/utils/avcstat and libselinux-1.23.10/utils/avcstat differ
diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.23.10/utils/avcstat.c
--- nsalibselinux/utils/avcstat.c 2005-05-11 10:42:09.000000000 -0400
+++ libselinux-1.23.10/utils/avcstat.c 2005-05-11 10:45:11.000000000 -0400
@@ -90,12 +90,17 @@
--- libselinux-1.23.10/utils/avcstat.c.rhat 2005-04-29 14:07:14.000000000 -0400
+++ libselinux-1.23.10/utils/avcstat.c 2005-05-11 10:57:30.000000000 -0400
@@ -90,12 +90,15 @@
int main(int argc, char **argv)
{
@ -47,17 +44,11 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.
progname = basename(argv[0]);
+ memset(&last, 0, sizeof(last));
+ memset(&tot, 0, sizeof(tot));
+ memset(&rel, 0, sizeof(rel));
+
while((i = getopt(argc, argv, "cf:h?-")) != -1) {
switch (i) {
case 'c':
@@ -141,11 +146,9 @@
if (fd < 0)
die("open: \'%s\'", avcstatfile);
- memset(&last, 0, sizeof(last));
@@ -144,7 +147,6 @@
for (i = 0;; i++) {
char *line;
ssize_t ret, parsed = 0;
@ -65,6 +56,11 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/utils/avcstat.c libselinux-1.
memset(buf, 0, DEF_BUF_SIZE);
ret = read(fd, buf, DEF_BUF_SIZE);
Binary files nsalibselinux/utils/compute_av and libselinux-1.23.10/utils/compute_av differ
Binary files nsalibselinux/utils/compute_create and libselinux-1.23.10/utils/compute_create differ
Binary files nsalibselinux/utils/compute_member and libselinux-1.23.10/utils/compute_member differ
@@ -166,7 +168,6 @@
"hits", "misses", "allocs", "reclaims", "frees");
memset(&tot, 0, sizeof(tot));
- memset(&last, 0, sizeof(last));
while ((line = strtok(NULL, "\n"))) {
struct avc_cache_stats tmp;

View File

@ -1,7 +1,7 @@
Summary: SELinux library and simple utilities
Name: libselinux
Version: 1.23.10
Release: 2
Release: 3
License: Public domain (uncopyrighted)
Group: System Environment/Libraries
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@ -85,6 +85,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man8/*
%changelog
* Fri Apr 26 2005 Dan Walsh <dwalsh@redhat.com> 1.23.10-3
- Fix avcstat to clear totals
* Fri Apr 26 2005 Dan Walsh <dwalsh@redhat.com> 1.23.10-2
- Add info to man page