rpms/setroubleshoot/F-11 setroubleshoot-log.patch, NONE, 1.1 setroubleshoot.spec, 1.138, 1.139

[Daniel J Walsh]

Author: dwalsh

Update of /cvs/extras/rpms/setroubleshoot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2098

Modified Files:
	setroubleshoot.spec 
Added Files:
	setroubleshoot-log.patch 
Log Message:
* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.14-3
- Change sedispatch to complain in /var/log/messages rather then the console.


setroubleshoot-log.patch:
 sedispatch.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE setroubleshoot-log.patch ---
diff -up setroubleshoot-2.1.14/src/sedispatch.c.log setroubleshoot-2.1.14/src/sedispatch.c
--- setroubleshoot-2.1.14/src/sedispatch.c.log	2009-08-18 08:43:43.000000000 -0400
+++ setroubleshoot-2.1.14/src/sedispatch.c	2009-08-18 08:44:04.000000000 -0400
@@ -85,7 +85,7 @@ static 	DBusConnection* init_dbus(void) 
 	// connect to the bus
 	conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
 	if (dbus_error_is_set(&err)) { 
-		syslog(LOG_DAEMON, "Connection Error (%s): AVC Will be dropped\n", err.message); 
+		syslog(LOG_ERR, "Connection Error (%s): AVC Will be dropped\n", err.message); 
 		dbus_error_free(&err); 
 	}
 	return conn;
@@ -108,7 +108,7 @@ int main(int argc __attribute__((unused)
 	/* Initialize the auparse library */
 	au = auparse_init(AUSOURCE_FEED, 0);
 	if (au == NULL) {
-		syslog(LOG_DAEMON,"sedispatch is exiting due to auparse init errors");
+		syslog(LOG_ERR,"sedispatch is exiting due to auparse init errors");
 		return -1;
 	}
 
@@ -135,7 +135,7 @@ int main(int argc __attribute__((unused)
 	if (stop)
 		syslog(LOG_DEBUG,"sedispatch is exiting on stop request\n");
 	else
-		syslog(LOG_DAEMON,"sedispatch is exiting on stdin EOF\n");
+		syslog(LOG_ERR,"sedispatch is exiting on stdin EOF\n");
 
 	return 0;
 }
@@ -159,7 +159,7 @@ static void dump_whole_record(auparse_st
 	const char *tcon = auparse_find_field(au, "tcontext");
 	if (is_setroubleshoot(scon) ||
 	    is_setroubleshoot(tcon)) {
-		syslog(LOG_DAEMON, "AVC Message for setroubleshoot, dropping message"); 
+		syslog(LOG_ERR, "AVC Message for setroubleshoot, dropping message"); 
 		return;
 	}
 			
@@ -168,7 +168,7 @@ static void dump_whole_record(auparse_st
 	  len = asprintf(&tmp, "%s%s\n", 
 			 tmp, auparse_get_record_text(au));
 	  if (len < 0) {
-	    syslog(LOG_DAEMON,"sedispatch out of memory\n");
+	    syslog(LOG_ERR,"sedispatch out of memory\n");
 	    free(tmp);
 	    return;
 	  }


Index: setroubleshoot.spec
===================================================================
RCS file: /cvs/extras/rpms/setroubleshoot/F-11/setroubleshoot.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- setroubleshoot.spec	1 Jul 2009 21:07:12 -0000	1.138
+++ setroubleshoot.spec	18 Aug 2009 12:46:28 -0000	1.139
@@ -1,13 +1,14 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 2.1.14
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
 Source0: %{name}-%{version}.tar.gz
 Source2: setroubleshoot.logrotate
 patch: setroubleshoot-lstat.patch
+patch2: setroubleshoot-log.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: perl-XML-Parser
 BuildRequires: intltool gettext python
@@ -85,6 +86,7 @@ touch --no-create %{_datadir}/icons/hico
 %prep
 %setup -q
 %patch -p1 -b .lstat
+%patch2 -p1 -b .log
 
 %build
 %configure
@@ -197,6 +199,9 @@ Setroubleshoot documentation package
 %doc %{pkgdocdir}
 
 %changelog
+* Tue Aug 18 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.14-3
+- Change sedispatch to complain in /var/log/messages rather then the console.
+
 * Wed Jul 1 2009 Dan Walsh <dwalsh at redhat.com> - 2.1.14-2
 - Change to use os.lstat to look at links