diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:13:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:13:12 +0100 |
| commit | 44ee165390643b6da88dd746de34163e175d24fd (patch) | |
| tree | 3a6c90010af5e23f234aac3a32e22965a1fe1b90 | |
| parent | cf1275d846783d84cc46de103108a899d3907f8c (diff) | |
| parent | 8021912232ed1cc14b9175e7efaa7d8961940c3e (diff) | |
| download | rsyslog-44ee165390643b6da88dd746de34163e175d24fd.tar.gz rsyslog-44ee165390643b6da88dd746de34163e175d24fd.tar.xz rsyslog-44ee165390643b6da88dd746de34163e175d24fd.zip | |
Merge branch 'v3-stable' into v4-stable
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | tools/syslogd.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -271,6 +271,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 9f2b9f64..598a6c94 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -3854,6 +3854,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; |