Merge branch 'master' into nomerge2

This commit is contained in:
Ivan Skytte Jørgensen
2017-04-11 15:48:52 +02:00

@ -2549,6 +2549,7 @@ Host *Dns::getIPLookupHost(key96_t key) {
// NULL if none
if ( numAlive == 0 ) {
logTrace( g_conf.m_logTraceDns, "END. None alive. return NULL" );
g_errno = EHOSTDEAD;
return NULL;
}