diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 19:13:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-25 19:13:30 +0100 |
| commit | 1f48ed19f369b7324c15c432d56258f22791761b (patch) | |
| tree | 82ee8dadb47dd398459ade8007a755526b7aadd1 /tools | |
| parent | 3313c4d6682993db5ef89b9d55ce910b63e20835 (diff) | |
| parent | 3056c15ef4d1d7b73a9591347cf0cef76c020792 (diff) | |
| download | rsyslog-1f48ed19f369b7324c15c432d56258f22791761b.tar.gz rsyslog-1f48ed19f369b7324c15c432d56258f22791761b.tar.xz rsyslog-1f48ed19f369b7324c15c432d56258f22791761b.zip | |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
doc/rsyslog_conf_modules.html
tests/Makefile.am
tests/sndrcv_drvr.sh
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 820cf273..99bb0474 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -2649,10 +2649,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) { |