diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-15 16:12:42 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-15 16:12:42 +0200 |
| commit | 6ce405a13e6d4722c33cd6dcce618ee3853df6a9 (patch) | |
| tree | 8ddfcbc5ddbb9970179ed6854a0c2063ece5c31d | |
| parent | 50521ab72bcf302958b007ca77f08ce65a368fb8 (diff) | |
| parent | 33acb956db2824a118656021d873143ff1475321 (diff) | |
| download | rsyslog-6ce405a13e6d4722c33cd6dcce618ee3853df6a9.tar.gz rsyslog-6ce405a13e6d4722c33cd6dcce618ee3853df6a9.tar.xz rsyslog-6ce405a13e6d4722c33cd6dcce618ee3853df6a9.zip | |
Merge branch 'v5-stable' into v6-stable
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/omudpspoof/omudpspoof.c | 15 | ||||
| -rw-r--r-- | tools/syslogd.c | 1 |
4 files changed, 10 insertions, 13 deletions
@@ -308,6 +308,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-?? 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. +- 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/Makefile.am b/Makefile.am index b7bbe1c5..2f2f546b 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 # diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c index 35ce2a9f..252f3647 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. * @@ -205,8 +205,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; @@ -244,17 +242,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 */ diff --git a/tools/syslogd.c b/tools/syslogd.c index 9e4b92fe..5e9d070d 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2195,6 +2195,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 |