diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:15:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-04 13:15:24 +0100 |
| commit | ad58b9c8fbc6159a361d40d97decddb95758c0a7 (patch) | |
| tree | dda71332b43cf665a284111b98053a6bc6aecf4a /tools | |
| parent | c3f07d9dda55a993aebeb4fbb05f1d597de46eaa (diff) | |
| parent | a65f638523ec5d2c7b2b68bdaea174f5bd8b719f (diff) | |
| download | rsyslog-ad58b9c8fbc6159a361d40d97decddb95758c0a7.tar.gz rsyslog-ad58b9c8fbc6159a361d40d97decddb95758c0a7.tar.xz rsyslog-ad58b9c8fbc6159a361d40d97decddb95758c0a7.zip | |
Merge branch 'v4-beta' into v4-devel
Conflicts:
ChangeLog
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 2806921c..17fcf9f3 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -3434,6 +3434,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; |