diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:20:13 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:20:13 +0100 |
| commit | 9e8556538a9ca220e7262271993200c1c03c2450 (patch) | |
| tree | fff0e455b9a96692aa545918aa139b2f6d1803da | |
| parent | 3fd95bfb5d522adb2e913becc94b272228469d99 (diff) | |
| parent | a65f638523ec5d2c7b2b68bdaea174f5bd8b719f (diff) | |
| download | rsyslog-9e8556538a9ca220e7262271993200c1c03c2450.tar.gz rsyslog-9e8556538a9ca220e7262271993200c1c03c2450.tar.xz rsyslog-9e8556538a9ca220e7262271993200c1c03c2450.zip | |
Merge branch 'v4-beta' into beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | tools/syslogd.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -738,6 +738,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 99bb0474..185852b6 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2648,6 +2648,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; |