diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:40:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:40:43 +0100 |
| commit | d8b3669e6d790c916afc0fa228e3cd7ac8d40063 (patch) | |
| tree | 27d76f8d3eeccceee502c1003ec5c4da1c0b3f4e /tools | |
| parent | 96790ad40308f031e9dfa218d7e48d4c16154f9e (diff) | |
| parent | dd40c7ff901d7d7414cda5cf60da647d450ed741 (diff) | |
| download | rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.tar.gz rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.tar.xz rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
doc/rsyslog_conf.html
runtime/net.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 5938cbbe..9f2b9f64 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -3855,10 +3855,10 @@ int realMain(int argc, char **argv) fprintf(stderr, "error -p is no longer supported, use module imuxsock instead"); } case 'q': /* add hostname if DNS resolving has failed */ - net.pACLAddHostnameOnFail = 1; + *(net.pACLAddHostnameOnFail) = 1; break; case 'Q': /* dont resolve hostnames in ACL to IPs */ - net.pACLDontResolve = 1; + *(net.pACLDontResolve) = 1; break; case 'r': /* accept remote messages */ if(iCompatibilityMode < 3) { |