diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:20:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:20:24 +0100 |
| commit | 68bacb9a9395d4fffb063362940f74f4a3e45f28 (patch) | |
| tree | 0edd1a82175145ec585e392a25345856f1f2adad | |
| parent | 113915eb9dfddf5a04f8116b01b71e591e75f193 (diff) | |
| parent | ad58b9c8fbc6159a361d40d97decddb95758c0a7 (diff) | |
| download | rsyslog-68bacb9a9395d4fffb063362940f74f4a3e45f28.tar.gz rsyslog-68bacb9a9395d4fffb063362940f74f4a3e45f28.tar.xz rsyslog-68bacb9a9395d4fffb063362940f74f4a3e45f28.zip | |
Merge branch 'v4-devel'
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | tools/syslogd.c | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -338,6 +338,8 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-?? - bugfix (kind of): check if TCP connection is still alive if using TLS Thanks to Jonathan Bond-Caron for the patch. - imported changes from 4.5.7 and below +- bugfix: potential segfault when -p command line option was used + Thanks for varmojfekoj for pointing me at this bug. --------------------------------------------------------------------------- Version 4.5.7 [v4-beta] (rgerhards), 2009-11-18 - added a so-called "On Demand Debug" mode, in which debug output can @@ -783,6 +785,8 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? in doc set (require TLS drivers) - bugfix: $CreateDirs variable not properly initialized, default thus was random (but most often "on") +- bugfix: potential segfault when -p command line option was used + thanks to varmojfekoj for pointing me at this bug --------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty diff --git a/tools/syslogd.c b/tools/syslogd.c index 2470b6fa..1f7a29a6 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2724,6 +2724,7 @@ int realMain(int argc, char **argv) } else { fprintf(stderr, "error -p is no longer supported, use module imuxsock instead"); } + break; case 'q': /* add hostname if DNS resolving has failed */ *(net.pACLAddHostnameOnFail) = 1; break; |