Skip to content

[pull] master from NLnetLabs:master #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Mar 6, 2026
Merged

[pull] master from NLnetLabs:master #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df0cb18
Update indentation to match surrounding code
tobbez Mar 6, 2026
1493eaf
Improve ignored old serial log message
tobbez Mar 6, 2026
59fba2d
Merge pull request #477 from tobbez/old-ignored-serial-log-message
wcawijngaards Mar 6, 2026
eb1f335
Changelog and RELNOTES note for #477
wcawijngaards Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions doc/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
6 March 2026: Wouter
- Merge #477: Improve ignored old serial log message.

24 February 2026: Willem
- The master branch continues with version 4.14.2 in development

Expand Down
3 changes: 2 additions & 1 deletion doc/RELNOTES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
NSD RELEASE NOTES

4.14.2
4.14.2 (in development)
================
FEATURES:
BUG FIXES:
- Merge #477: Improve ignored old serial log message.

4.14.1
================
Expand Down
12 changes: 6 additions & 6 deletions xfrd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2302,12 +2302,12 @@ xfrd_parse_received_xfr_packet(xfrd_zone_type* zone, buffer_type* packet,
if(zone->soa_disk_acquired != 0 &&
zone->state != xfrd_zone_expired /* if expired - accept anything */ &&
compare_serial(ntohl(soa->serial), ntohl(zone->soa_disk.serial)) < 0) {
DEBUG(DEBUG_XFRD,1, (LOG_INFO,
"xfrd: zone %s ignoring old serial (%u/%u) from %s",
zone->apex_str, ntohl(zone->soa_disk.serial), ntohl(soa->serial), zone->master->ip_address_spec));
VERBOSITY(1, (LOG_INFO,
"xfrd: zone %s ignoring old serial (%u/%u) from %s",
zone->apex_str, ntohl(zone->soa_disk.serial), ntohl(soa->serial), zone->master->ip_address_spec));
DEBUG(DEBUG_XFRD,1, (LOG_INFO,
"xfrd: zone %s ignoring old serial (local: %u, remote: %u) from %s",
zone->apex_str, ntohl(zone->soa_disk.serial), ntohl(soa->serial), zone->master->ip_address_spec));
VERBOSITY(1, (LOG_INFO,
"xfrd: zone %s ignoring old serial (local: %u, remote: %u) from %s",
zone->apex_str, ntohl(zone->soa_disk.serial), ntohl(soa->serial), zone->master->ip_address_spec));
region_destroy(tempregion);
return xfrd_packet_bad;
}
Expand Down
Loading