rpms/rsyslog/devel rsyslog-3.14.1.legacyOpts.patch, NONE, 1.1 rsyslog.spec, 1.36, 1.37

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726

Modified Files:
	rsyslog.spec 
Added Files:
	rsyslog-3.14.1.legacyOpts.patch 
Log Message:
- prevent undesired error description in legacy
  warning messages


rsyslog-3.14.1.legacyOpts.patch:

--- NEW FILE rsyslog-3.14.1.legacyOpts.patch ---
diff -up rsyslog-3.14.1/syslogd.c.legacyOpts rsyslog-3.14.1/syslogd.c
--- rsyslog-3.14.1/syslogd.c.legacyOpts	2008-04-07 17:15:45.000000000 +0200
+++ rsyslog-3.14.1/syslogd.c	2008-04-07 17:15:49.000000000 +0200
@@ -1740,6 +1740,7 @@ void legacyOptsHook(void)
 
 	while(pThis != NULL) {
 		if(pThis->line != NULL) {
+			errno = 0;
 			errmsg.LogError(NO_ERRCODE, "Warning: backward compatibility layer added to following "
 				        "directive to rsyslog.conf: %s", pThis->line);
 			conf.cfsysline(pThis->line);
@@ -3111,7 +3112,7 @@ int realMain(int argc, char **argv)
 					legacyOptsEnq((uchar *) "ModLoad imuxsock");
 					bImUxSockLoaded = 1;
 				}
-				legacyOptsEnq((uchar *) "OmitLocaLogging");
+				legacyOptsEnq((uchar *) "OmitLocalLogging");
 			} else {
 				fprintf(stderr, "error -o is no longer supported, use module imuxsock instead");
 			}


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rsyslog.spec	8 Apr 2008 10:22:57 -0000	1.36
+++ rsyslog.spec	8 Apr 2008 12:39:09 -0000	1.37
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.14.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -14,6 +14,7 @@
 Patch1: rsyslog-3.11.4-undef.patch
 Patch2: rsyslog-3.14.1-segfaultExprFilt.patch
 Patch3: rsyslog-3.14.1-symbolLookup.patch
+Patch4: rsyslog-3.14.1.legacyOpts.patch
 BuildRequires: zlib-devel
 BuildRequires: autoconf automake
 Requires: logrotate >= 3.5.2
@@ -71,6 +72,7 @@
 %patch1 -p1 -b .undef
 %patch2 -p1 -b .segfaultExprFilt
 %patch3 -p1 -b .symbolLookup
+%patch4 -p1 -b .legacyOpts
 
 %build
 %configure	--sbindir=%{sbindir} \
@@ -162,6 +164,10 @@
 %{_libdir}/rsyslog/omgssapi.so
 
 %changelog
+* Tue Apr 08 2008 Peter Vrabec <pvrabec at redhat.com> 3.14.1-5
+- prevent undesired error description in legacy 
+  warning messages
+
 * Tue Apr 08 2008 Peter Vrabec <pvrabec at redhat.com> 3.14.1-4
 - adjust symbol lookup method to 2.6 kernel