diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:01:53 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-30 12:01:53 +0100 |
commit | 5a0bd837e9ea203d6a427d61c869b44c25bf44cf (patch) | |
tree | aeeea61f11ff1ca31a182870fa6c137014967cbb /runtime/net.h | |
parent | 52a0120a3845bd17855156dd59ed6beaf9658e0f (diff) | |
parent | cf1275d846783d84cc46de103108a899d3907f8c (diff) | |
download | rsyslog-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.h')
-rw-r--r-- | runtime/net.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/net.h b/runtime/net.h index a50b6fcb..ec364b1c 100644 --- a/runtime/net.h +++ b/runtime/net.h @@ -149,8 +149,8 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */ /* v5 interface additions */ int (*CmpHost)(struct sockaddr_storage *, struct sockaddr_storage*, size_t); /* data members - these should go away over time... TODO */ - int pACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */ - int pACLDontResolve; /* add hostname to acl instead of resolving it to IP(s) */ + int *pACLAddHostnameOnFail; /* add hostname to acl when DNS resolving has failed */ + int *pACLDontResolve; /* add hostname to acl instead of resolving it to IP(s) */ ENDinterface(net) #define netCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ |