diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-17 10:11:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-17 10:11:29 +0200 |
| commit | 4824e56aed37b5edffc883cb53c91f0b61c3df62 (patch) | |
| tree | b693a073c057a425e8957d763036eec03509e00d /runtime | |
| parent | 911101ed26292c766eae0b48575e5911b96d2ea7 (diff) | |
| download | rsyslog-4824e56aed37b5edffc883cb53c91f0b61c3df62.tar.gz rsyslog-4824e56aed37b5edffc883cb53c91f0b61c3df62.tar.xz rsyslog-4824e56aed37b5edffc883cb53c91f0b61c3df62.zip | |
moved "DisableDNS" variable to global data pool
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/glbl.h | 14 | ||||
| -rw-r--r-- | runtime/net.c | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/runtime/glbl.h b/runtime/glbl.h index 6c519cb7..3116b66b 100644 --- a/runtime/glbl.h +++ b/runtime/glbl.h @@ -47,12 +47,14 @@ typedef struct glbl_s { /* interfaces */ BEGINinterface(glbl) /* name must also be changed in ENDinterface macro! */ uchar* (*GetWorkDir)(void); - int (*GetDefPFFamily)(void); - rsRetVal (*SetDefPFFamily)(int); - int (*GetDropMalPTRMsgs)(void); - rsRetVal (*SetDropMalPTRMsgs)(int); - int (*GetOption_DisallowWarning)(void); - rsRetVal (*SetOption_DisallowWarning)(int); +#define SIMP_PROP(name, dataType) \ + dataType (*Get##name)(void); \ + rsRetVal (*Set##name)(dataType); + SIMP_PROP(DefPFFamily, int); + SIMP_PROP(DropMalPTRMsgs, int); + SIMP_PROP(Option_DisallowWarning, int); + SIMP_PROP(DisableDNS, int); +#undef SIMP_PROP ENDinterface(glbl) #define glblCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */ diff --git a/runtime/net.c b/runtime/net.c index b61e4c15..bc4404cb 100644 --- a/runtime/net.c +++ b/runtime/net.c @@ -235,7 +235,7 @@ static rsRetVal AddAllowedSender(struct AllowedSenders **ppRoot, struct AllowedS iRet = AddAllowedSenderEntry(ppRoot, ppLast, iAllow, iSignificantBits); } else { /* we need to process a hostname ACL */ - if (DisableDNS) { + if(glbl.GetDisableDNS()) { errmsg.LogError(NO_ERRCODE, "Ignoring hostname based ACLs because DNS is disabled."); ABORT_FINALIZE(RS_RET_OK); } @@ -656,7 +656,7 @@ gethname(struct sockaddr_storage *f, uchar *pszHostFQDN) ABORT_FINALIZE(RS_RET_INVALID_SOURCE); } - if (!DisableDNS) { + if(!glbl.GetDisableDNS()) { sigemptyset(&nmask); sigaddset(&nmask, SIGHUP); pthread_sigmask(SIG_BLOCK, &nmask, &omask); @@ -713,7 +713,7 @@ gethname(struct sockaddr_storage *f, uchar *pszHostFQDN) pthread_sigmask(SIG_SETMASK, &omask, NULL); } - if (error || DisableDNS) { + if(error || glbl.GetDisableDNS()) { dbgprintf("Host name for your address (%s) unknown\n", ip); strcpy((char*) pszHostFQDN, ip); ABORT_FINALIZE(RS_RET_ADDRESS_UNKNOWN); |