diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 14:46:58 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 14:46:58 +0100 |
| commit | 8aec830cf5531390b444ab0744d629b5e89e7440 (patch) | |
| tree | 4ae5870a3e120dc69937c85d7353b99a6e7c2c3c | |
| parent | 0fd8143d8719d08d9feb0a304bb352dd7c4bbab6 (diff) | |
| parent | 96790ad40308f031e9dfa218d7e48d4c16154f9e (diff) | |
| download | rsyslog-8aec830cf5531390b444ab0744d629b5e89e7440.tar.gz rsyslog-8aec830cf5531390b444ab0744d629b5e89e7440.tar.xz rsyslog-8aec830cf5531390b444ab0744d629b5e89e7440.zip | |
Merge branch 'v4-stable' into v4-beta
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | runtime/net.h | 4 | ||||
| -rw-r--r-- | tools/syslogd.c | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -174,6 +174,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- @@ -430,6 +432,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 ec364b1c..a50b6fcb 100644 --- a/runtime/net.h +++ b/runtime/net.h @@ -149,8 +149,8 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */ /* v5 interface additions */ int (*CmpHost)(struct sockaddr_storage *, struct sockaddr_storage*, size_t); /* 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 5 /* increment whenever you change the interface structure! */ diff --git a/tools/syslogd.c b/tools/syslogd.c index 7649d054..374d3307 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) { |