rpms/audit/devel audit-perms.patch,NONE,1.1 audit.spec,1.108,1.109

[fedora-cvs-commits at redhat.com]

Author: sgrubb

Update of /cvs/dist/rpms/audit/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17851

Modified Files:
	audit.spec 
Added Files:
	audit-perms.patch 
Log Message:
* Mon Aug 28 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-2
- Another minor update to auditctl -p option


audit-perms.patch:
 lib/libaudit.c |   19 ++-----------------
 src/auditctl.c |    4 ++++
 2 files changed, 6 insertions(+), 17 deletions(-)

--- NEW FILE audit-perms.patch ---
diff -ur audit-1.2.6/lib/libaudit.c audit-1.2.7/lib/libaudit.c
--- audit-1.2.6/lib/libaudit.c	2006-08-26 13:37:26.000000000 -0400
+++ audit-1.2.7/lib/libaudit.c	2006-08-28 14:10:13.000000000 -0400
@@ -554,28 +554,14 @@
 
 	rule->flags = AUDIT_FILTER_EXIT;
 	rule->action = AUDIT_ALWAYS;
-	//audit_rule_syscallbyname_data(rule, "all");
-/*	audit_rule_syscallbyname_data(rule, "chmod");
-	audit_rule_syscallbyname_data(rule, "fchmod");
-	audit_rule_syscallbyname_data(rule, "chown");
-	audit_rule_syscallbyname_data(rule, "fchown");
-	audit_rule_syscallbyname_data(rule, "lchown");
-	audit_rule_syscallbyname_data(rule, "creat");
-	audit_rule_syscallbyname_data(rule, "open");
-	audit_rule_syscallbyname_data(rule, "truncate");
-	audit_rule_syscallbyname_data(rule, "ftruncate");
-	audit_rule_syscallbyname_data(rule, "mkdir");
-	audit_rule_syscallbyname_data(rule, "rmdir");
-	audit_rule_syscallbyname_data(rule, "unlink");
-	audit_rule_syscallbyname_data(rule, "rename");
-	audit_rule_syscallbyname_data(rule, "link"); 
-	audit_rule_syscallbyname_data(rule, "symlink"); */ 
+	audit_rule_syscallbyname_data(rule, "all");
 	rule->field_count = 2;
 	rule->fields[0] = AUDIT_WATCH;
 	rule->values[0] = len;
 	rule->fieldflags[0] = AUDIT_EQUAL;
 	rule->buflen = len;
 	memcpy(&rule->buf[0], path, len);
+
 	// Default to all permissions
 	rule->fields[1] = AUDIT_PERM;
 	rule->fieldflags[1] = AUDIT_EQUAL;
@@ -886,7 +872,6 @@
 	int machine;
 
 	if (!strcmp(scall, "all")) {
-printf("doing all?\n");
 		for (i = 0; i < (AUDIT_BITMASK_SIZE-1); i++) 
 			rule->mask[i] = ~0;
 		return 0;
diff -ur audit-1.2.6/src/auditctl.c audit-1.2.7/src/auditctl.c
--- audit-1.2.6/src/auditctl.c	2006-08-26 15:22:16.000000000 -0400
+++ audit-1.2.7/src/auditctl.c	2006-08-28 14:34:47.000000000 -0400
@@ -197,6 +197,10 @@
 		fprintf(stderr, "The path passed for the watch is too big\n");
 		return 1;
 	}
+	if (path[0] != '/') {
+		fprintf(stderr, "The path must start with '/'\n");
+		return 1;
+	}
 	ptr = strdup(path);
 	base = basename(ptr);
 	nlen = strlen(base);


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- audit.spec	26 Aug 2006 19:57:03 -0000	1.108
+++ audit.spec	28 Aug 2006 23:03:50 -0000	1.109
@@ -1,12 +1,12 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.6
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
-
+Patch1: audit-perms.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: kernel-headers >= 2.6.17
@@ -55,6 +55,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 autoreconf -fv --install
@@ -166,6 +167,9 @@
 %config(noreplace) %attr(640,root,root) /etc/sysconfig/auditd
 
 %changelog
+* Mon Aug 28 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-2
+- Another minor update to auditctl -p option
+
 * Sat Aug 26 2006 Steve Grubb <sgrubb at redhat.com> 1.2.6-1
 - Apply updates to dispatcher
 - Fix a couple bugs regarding MLS labels