summaryrefslogtreecommitdiffstats
path: root/runtime/net.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-30 12:01:53 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-30 12:01:53 +0100
commit5a0bd837e9ea203d6a427d61c869b44c25bf44cf (patch)
treeaeeea61f11ff1ca31a182870fa6c137014967cbb /runtime/net.c
parent52a0120a3845bd17855156dd59ed6beaf9658e0f (diff)
parentcf1275d846783d84cc46de103108a899d3907f8c (diff)
downloadrsyslog-5a0bd837e9ea203d6a427d61c869b44c25bf44cf.tar.gz
rsyslog-5a0bd837e9ea203d6a427d61c869b44c25bf44cf.tar.bz2
rsyslog-5a0bd837e9ea203d6a427d61c869b44c25bf44cf.zip
Merge branch 'v4-stable' into v5-stable
Conflicts: doc/rsyslog_conf_modules.html
Diffstat (limited to 'runtime/net.c')
-rw-r--r--runtime/net.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/net.c b/runtime/net.c
index 5cafe522..e91c8a7f 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)