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.h | |
| parent | 3313c4d6682993db5ef89b9d55ce910b63e20835 (diff) | |
| parent | 3056c15ef4d1d7b73a9591347cf0cef76c020792 (diff) | |
| download | rsyslog-1f48ed19f369b7324c15c432d56258f22791761b.tar.gz rsyslog-1f48ed19f369b7324c15c432d56258f22791761b.tar.bz2 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.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! */ |