From dec9bcfe2a869b0f70b5f2a18e08a0322ebf5517 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 12 Jun 2012 13:58:13 +0200 Subject: bugfix "$PreserveFQDN on" was not honored in some modules Thanks to bodik for reporting this bug. --------------------------------------------- --- ChangeLog | 2 ++ tools/syslogd.c | 1 + 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index aaef8989..c72582db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Version 5.8.13 [V5-stable] 2012-06-?? - bugfix: "last message repeated n times" message was missing hostname Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting +- bugfix "$PreserveFQDN on" was not honored in some modules + Thanks to bodik for reporting this bug. --------------------------------------------------------------------------- Version 5.8.12 [V5-stable] 2012-06-06 - add small delay (50ms) after sending shutdown message diff --git a/tools/syslogd.c b/tools/syslogd.c index 0988d462..cbbb66bc 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2200,6 +2200,7 @@ static rsRetVal mainThread() if(myPid != ppid) kill(ppid, SIGTERM); + glbl.GenerateLocalHostNameProperty(); /* regenerate, FQDN setting may have changed */ /* If instructed to do so, we now drop privileges. Note that this is not 100% secure, * because outputs are already running at this time. However, we can implement -- cgit From e91c8d5f23885954cbc347a7e21f8ebc5651316d Mon Sep 17 00:00:00 2001 From: Abby Edwards Date: Tue, 12 Jun 2012 11:47:27 -0500 Subject: adding pkgconfigdir definition to Makefile.am to help build properly --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 48eb26ce..9eccaff7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,8 @@ sbin_PROGRAMS = pkglib_LTLIBRARIES = +pkgconfigdir = $(libdir)/pkgconfig + if ENABLE_INET pkglib_LTLIBRARIES += lmtcpsrv.la lmtcpclt.la # -- cgit From 33acb956db2824a118656021d873143ff1475321 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 15 Jun 2012 16:08:16 +0200 Subject: bugfix: randomized IP option header in omudpspoof caused problems closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 Thanks to Rick Brown for helping to test out the patch. --- ChangeLog | 3 +++ plugins/omudpspoof/omudpspoof.c | 15 ++------------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index c72582db..23c55ce8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ Version 5.8.13 [V5-stable] 2012-06-?? Thanks to Zdenek Salvet for finding this bug and to Bodik for reporting - bugfix "$PreserveFQDN on" was not honored in some modules Thanks to bodik for reporting this bug. +- bugfix: randomized IP option header in omudpspoof caused problems + closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327 + Thanks to Rick Brown for helping to test out the patch. --------------------------------------------------------------------------- Version 5.8.12 [V5-stable] 2012-06-06 - add small delay (50ms) after sending shutdown message diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index 11be59d6..30792531 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -24,7 +24,7 @@ * rgerhards, 2009-07-10 * * Copyright 2009 David Lang (spoofing code) - * Copyright 2009 Rainer Gerhards and Adiscon GmbH. + * Copyright 2009-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of rsyslog. * @@ -191,8 +191,6 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len) struct addrinfo *r; int lsent = 0; int bSendSuccess; - int j, build_ip; - u_char opt[20]; struct sockaddr_in *tempaddr,source_ip; libnet_ptag_t ip, ipo; libnet_ptag_t udp; @@ -230,17 +228,8 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len) DBGPRINTF("Can't build UDP header: %s\n", libnet_geterror(libnet_handle)); } - build_ip = 0; - /* this is not a legal options string */ - for (j = 0; j < 20; j++) { - opt[j] = libnet_get_prand(LIBNET_PR2); - } - ipo = libnet_build_ipv4_options(opt, 20, libnet_handle, ipo); - if (ipo == -1) { - DBGPRINTF("Can't build IP options: %s\n", libnet_geterror(libnet_handle)); - } ip = libnet_build_ipv4( - LIBNET_IPV4_H + 20 + len + LIBNET_UDP_H, /* length */ + LIBNET_IPV4_H + len + LIBNET_UDP_H, /* length */ 0, /* TOS */ 242, /* IP ID */ 0, /* IP Frag */ -- cgit