Another fix for clang analysis.
@@ -1843,6 +1843,7 @@ xfrd_parse_received_xfr_packet(xfrd_zone_type* zone, buffer_type* packet,
size_t nscount = NSCOUNT(packet);
int done = 0;
region_type* tempregion = NULL;
+ assert(zone->master);
/* has to be axfr / ixfr reply */
if(!buffer_available(packet, QHEADERSZ)) {
@@ -1857,21 +1858,21 @@ xfrd_parse_received_xfr_packet(xfrd_zone_type* zone, buffer_type* packet,
"got query with ID %d and %d needed", ID(packet), zone->query_id));
if(ID(packet) != zone->query_id) {
log_msg(LOG_ERR, "xfrd: zone %s received bad query id from %s, "
- "dropped", zone->apex_str,
- (zone->master?zone->master->ip_address_spec:"none"));
+ "dropped",
+ zone->apex_str, zone->master->ip_address_spec);
return xfrd_packet_bad;
}
/* check RCODE in all response messages */
if(RCODE(packet) != RCODE_OK) {
/* for IXFR failures, do not log unless higher verbosity */
if(!(verbosity < 3 && (RCODE(packet) == RCODE_IMPL ||
- RCODE(packet) == RCODE_FORMAT) && zone->master &&
+ RCODE(packet) == RCODE_FORMAT) &&
!zone->master->ixfr_disabled &&
!zone->master->use_axfr_only)) {
log_msg(LOG_ERR, "xfrd: zone %s received error code %s from "
"%s",
zone->apex_str, rcode2str(RCODE(packet)),
- (zone->master?zone->master->ip_address_spec:"none"));
+ zone->master->ip_address_spec);
}
if (RCODE(packet) == RCODE_IMPL ||
RCODE(packet) == RCODE_FORMAT) {
