rpms/audit/devel audit-1.1.4-semanage.patch, 1.2, 1.3 audit.spec, 1.80, 1.81

[fedora-cvs-commits at redhat.com]

Author: sgrubb

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

Modified Files:
	audit-1.1.4-semanage.patch audit.spec 
Log Message:
* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-4
- Change audit_log_semanage_message to check strlen as well as NULL.


audit-1.1.4-semanage.patch:
 audit_logging.c |   37 ++++++++++++++++++++++---------------
 libaudit.h      |    5 +++--
 2 files changed, 25 insertions(+), 17 deletions(-)

Index: audit-1.1.4-semanage.patch
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit-1.1.4-semanage.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audit-1.1.4-semanage.patch	9 Feb 2006 22:21:09 -0000	1.2
+++ audit-1.1.4-semanage.patch	10 Feb 2006 18:39:57 -0000	1.3
@@ -1,6 +1,6 @@
 diff -ur audit-1.1.4.orig/lib/audit_logging.c audit-1.1.4/lib/audit_logging.c
 --- audit-1.1.4.orig/lib/audit_logging.c	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/audit_logging.c	2006-02-09 17:14:53.000000000 -0500
++++ audit-1.1.4/lib/audit_logging.c	2006-02-10 13:28:28.000000000 -0500
 @@ -405,8 +405,10 @@
   *        only when user is NULL.
   * new_seuser - the new seuser that the login user is getting
@@ -24,9 +24,21 @@
  	const char *tty, int result)
  {
  	const char *success;
-@@ -445,12 +448,14 @@
+@@ -436,21 +439,23 @@
  
- 	if (name)
+ 	_resolve_addr(addrbuf, host);
+ 
+-	if (pgname == NULL) {
++	if (pgname == NULL || strlen(pgname) == 0) {
+ 		_get_exename(exename, sizeof(exename));
+ 		pgname = exename;
+ 	}
+-	if (tty == NULL) 
++	if (tty == NULL || strlen(tty) == 0) 
+ 		tty = _get_tty(ttyname, TTY_PATH);
+ 
+-	if (name)
++	if (name && strlen(name) > 0)
  		snprintf(buf, sizeof(buf), 
 -	     "op=%s acct=%s old-seuser=%s old-role=%s new-seuser=%s new-role=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
 +	     "op=%s acct=%s old-seuser=%s old-role=%s old-range=%s new-seuser=%s new-role=%s new-range=%s exe=%s (hostname=%s, addr=%s, terminal=%s res=%s)",
@@ -66,7 +78,7 @@
  			addrbuf,
 diff -ur audit-1.1.4.orig/lib/libaudit.h audit-1.1.4/lib/libaudit.h
 --- audit-1.1.4.orig/lib/libaudit.h	2006-02-09 16:03:31.000000000 -0500
-+++ audit-1.1.4/lib/libaudit.h	2006-02-09 16:14:51.000000000 -0500
++++ audit-1.1.4/lib/libaudit.h	2006-02-09 17:15:39.000000000 -0500
 @@ -384,8 +384,9 @@
  	const char *tty, uid_t uid);
  extern int audit_log_semanage_message(int audit_fd, int type,


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- audit.spec	9 Feb 2006 22:21:09 -0000	1.80
+++ audit.spec	10 Feb 2006 18:39:57 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: User space tools for 2.6 kernel auditing.
 Name: audit
 Version: 1.1.4
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
@@ -148,6 +148,9 @@
 
 
 %changelog
+* Fri Feb 10 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-4
+- Change audit_log_semanage_message to check strlen as well as NULL.
+
 * Thu Feb 9 2006 Steve Grubb <sgrubb at redhat.com> 1.1.4-3
 - Change audit_log_semanage_message to take new params.