diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:40:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:40:43 +0100 |
| commit | d8b3669e6d790c916afc0fa228e3cd7ac8d40063 (patch) | |
| tree | 27d76f8d3eeccceee502c1003ec5c4da1c0b3f4e /runtime | |
| parent | 96790ad40308f031e9dfa218d7e48d4c16154f9e (diff) | |
| parent | dd40c7ff901d7d7414cda5cf60da647d450ed741 (diff) | |
| download | rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.tar.gz rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.tar.xz rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
doc/rsyslog_conf.html
runtime/net.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/net.c | 3 | ||||
| -rw-r--r-- | runtime/net.h | 4 |
2 files changed, 5 insertions, 2 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) 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! */ |