From e4542eb926c9fd757dc8f40f4fe6cb843b8b2650 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 12 Nov 2009 14:07:12 +0100 Subject: bugfix: segfault on startup when -q or -Q option was given bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157 Thanks to Jonas Nogueira for reporting this bug. --- ChangeLog | 3 +++ runtime/net.h | 4 ++-- tools/syslogd.c | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3946c2a..0c6810ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? [if librelp != 1.0.0 is used] - bugfix: sending syslog messages with zip compression did not work - bugfix: potential hang condition on queue shutdown +- bugfix: segfault on startup when -q or -Q option was given + bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=157 + Thanks to Jonas Nogueira for reporting this bug. - clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers] in doc set (require TLS drivers) --------------------------------------------------------------------------- diff --git a/runtime/net.h b/runtime/net.h index 092c3116..8e64f7ab 100644 --- a/runtime/net.h +++ b/runtime/net.h @@ -147,8 +147,8 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */ rsRetVal (*DestructPermittedPeers)(permittedPeers_t **ppRootPeer); rsRetVal (*PermittedPeerWildcardMatch)(permittedPeers_t *pPeer, uchar *pszNameToMatch, int *pbIsMatching); /* data members - these should go away over time... TODO */ - int *pACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */ - int *pACLDontResolve; /* add hostname to acl instead of resolving it to IP(s) */ + int pACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */ + int pACLDontResolve; /* add hostname to acl instead of resolving it to IP(s) */ ENDinterface(net) #define netCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */ diff --git a/tools/syslogd.c b/tools/syslogd.c index 6f32b262..9dbea061 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -3422,10 +3422,10 @@ int realMain(int argc, char **argv) fprintf(stderr, "error -p is no longer supported, use module imuxsock instead"); } case 'q': /* add hostname if DNS resolving has failed */ - *net.pACLAddHostnameOnFail = 1; + net.pACLAddHostnameOnFail = 1; break; case 'Q': /* dont resolve hostnames in ACL to IPs */ - *net.pACLDontResolve = 1; + net.pACLDontResolve = 1; break; case 'r': /* accept remote messages */ if(iCompatibilityMode < 3) { -- cgit From 96790ad40308f031e9dfa218d7e48d4c16154f9e Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 12 Nov 2009 14:27:54 +0100 Subject: cosmetic: mention imported v3-bugfix in ChangeLog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9329aa1a..63facfa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Version 4.4.3 [v4-stable] (rgerhards), 2009-10-?? Thanks to Klaus Tachtler for reporting this bug. - bugfix: potential hang condition on queue shutdown [imported from v3-stable] +- bugfix: segfault on startup when -q or -Q option was given + [imported from v3-stable] --------------------------------------------------------------------------- Version 4.4.2 [v4-stable] (rgerhards), 2009-10-09 - bugfix: invalid handling of zero-sized messages, could lead to mis- -- cgit