> else if (((queue_running && !deliver_force) ||
> continue_hostname != NULL) &&
> ((domain_retry_record != NULL &&
> now < domain_retry_record->next_try &&
> !domain_retry_record->expired)
> ||
> (address_retry_record != NULL &&
> now < address_retry_record->next_try))
> &&
> (domain_retry_record != NULL ||
> address_retry_record == NULL ||
> !retry_ultimate_address_timeout(addr->address_retry_key,
> addr->domain, address_retry_record, now)))
> {
> addr->message = US"retry time not reached";
> addr->basic_errno = ERRNO_RRETRY;
> (void)post_process_one(addr, DEFER, LOG_MAIN, DTYPE_ROUTER, 0);
> }
4.76 has a different test that doesn't have the
retry_ultimate_address_timeout piece...
else if (((queue_running && !deliver_force) || continue_hostname !=
NULL)
&&
((domain_retry_record != NULL &&
now < domain_retry_record->next_try &&
!domain_retry_record->expired)
||
(address_retry_record != NULL &&
now < address_retry_record->next_try))
)
{
addr->message = US"retry time not reached";
addr->basic_errno = ERRNO_RRETRY;
(void)post_process_one(addr, DEFER, LOG_MAIN, DTYPE_ROUTER, 0);
}
--
Sent from room 641A
"Jo da, riktig fint i kveld" -- Asbjørn på Skutholmen
http://www.shady.com/solnedgang.jpg
Kevin Smith | ShadeTree Software, Philadelphia, PA, USA; 215-487-3811
| Kevin/MNC 215-487-2125
%20%7C%7C%0A>%20%0A>%204.76%20has%20a%20different%20test%20that%20doesn't%20have%20the%0A>%20retry_ultimate_address_timeout%20piece...%0A>%20%0A>%20%0A>%20%0A>%20%0A>%20%0A>%20%0A>%20--%20%0A>%20Sent%20from%20room%20641A%0A>%20%22Jo%20da,%20riktig%20fint%20i%20kveld%22%20--%20Asbj%C3%B8rn%20p%C3%A5%20Skutholmen%0A>%20http://www.shady.com/solnedgang.jpg%0A>%20%0A>%20%0A>%20 "Répondre à ce message")
