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 /runtime/net.c | |
| 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 'runtime/net.c')
| -rw-r--r-- | runtime/net.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/net.c b/runtime/net.c index dfae53e2..f52d408c 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -1568,6 +1568,9 @@ CODESTARTobjQueryInterface(net) pIf->DestructPermittedPeers = DestructPermittedPeers; pIf->PermittedPeerWildcardMatch = PermittedPeerWildcardMatch; pIf->CmpHost = CmpHost; + /* data members */ + pIf->pACLAddHostnameOnFail = &ACLAddHostnameOnFail; + pIf->pACLDontResolve = &ACLDontResolve; finalize_it: ENDobjQueryInterface(net) |