diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 10:38:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 10:38:46 +0100 |
| commit | 0957820a1076d7fcf182ba60c12e5946c193545f (patch) | |
| tree | 2339489d05441895d1b221cab59fae36816c33eb /runtime/net.h | |
| parent | c9841fbd368e58674cc166e6186b2a29f9895211 (diff) | |
| parent | 9e28d47aaa506709a9e80e318527ceb4443cbffe (diff) | |
| download | rsyslog-0957820a1076d7fcf182ba60c12e5946c193545f.tar.gz rsyslog-0957820a1076d7fcf182ba60c12e5946c193545f.tar.xz rsyslog-0957820a1076d7fcf182ba60c12e5946c193545f.zip | |
Merge branch 'v4-devel'
Conflicts:
doc/rsyslog_conf_modules.html
gss-misc.c
plugins/imgssapi/imgssapi.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/glbl.c
runtime/glbl.h
runtime/net.c
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 9e6fb9da..2add3557 100644 --- a/runtime/net.h +++ b/runtime/net.h @@ -152,8 +152,8 @@ BEGINinterface(net) /* name must also be changed in ENDinterface macro! */ rsRetVal (*HasRestrictions)(uchar *, int *bHasRestrictions); int (*isAllowedSender2)(uchar *pszType, struct sockaddr *pFrom, const char *pszFromHost, int bChkDNS); /* 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 6 /* increment whenever you change the interface structure! */ |