upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '4386-fix-assertion-failure-when-using--X-named-option-9.18' into 'bind-9.18'

Browse source 
[9.18] Fix assertion failure when using -X and lock-file in configuration

See merge request isc-projects/bind9!8430
This commit is contained in:
Ondřej Surý 2023-10-26 12:07:54 +00:00
commit cdd68a3700
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
6275. [bug] Fix assertion failure when using lock-file configuration
option together -X argument to named. [GL #4386]
6274. [bug] The 'lock-file' file was being removed when it
shouldn't have been making it ineffective if named was
started 3 or more times. [GL #4387]

5
bin/named/server.c
View file

@ -8443,10 +8443,7 @@ check_lockfile(named_server_t *server, const cfg_obj_t *config,
if (server->lockfile == NULL) {
return (ISC_R_NOMEMORY);
}
}
if (named_g_forcelock && named_g_defaultlockfile != NULL) {
INSIST(server->lockfile == NULL);
} else if (named_g_forcelock && named_g_defaultlockfile != NULL) {
server->lockfile = isc_mem_strdup(server->mctx,
named_g_defaultlockfile);
}

3
doc/notes/notes-current.rst
View file

@ -43,6 +43,9 @@ Bug Fixes
have been making it ineffective if named was started 3 or more
times. :gl:`#4387`
- When :any:`lock-file` was used at the same time as :option:`named -X`, the
assertion failure would be triggered. This has been fixed. :gl:`#4386`
Known Issues
~~~~~~~~~~~~