summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-12-04 13:11:50 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-12-04 13:11:50 +0100
commit8021912232ed1cc14b9175e7efaa7d8961940c3e (patch)
treecd990a4d92d281a641202476104c39e834b13e18
parent7b40604e9ae8a0948f17eafd4299eeb7fb3356c2 (diff)
downloadrsyslog-8021912232ed1cc14b9175e7efaa7d8961940c3e.tar.gz
rsyslog-8021912232ed1cc14b9175e7efaa7d8961940c3e.tar.xz
rsyslog-8021912232ed1cc14b9175e7efaa7d8961940c3e.zip
bugfix: potential segfault when -p command line option was used
thanks to varmojfekoj for pointing me at this bug
-rw-r--r--ChangeLog2
-rw-r--r--tools/syslogd.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 67d056a2..b670f29a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,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 75d5ff82..10283568 100644
--- a/tools/syslogd.c
+++ b/tools/syslogd.c
@@ -3421,6 +3421,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;