mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Fix assertion failure when using -X and lock-file in configuration

Closes #4386

See merge request isc-projects/bind9!8427
This commit is contained in:
Ondřej Surý
2023-10-26 11:43:13 +00:00
parent f2225ca9af 8294a43acf
commit c6edfa398c
3 changed files with 7 additions and 4 deletions
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 6274. [bug] The 'lock-file' file was being removed when it
shouldn't have been making it ineffective if named was shouldn't have been making it ineffective if named was
started 3 or more times. [GL #4387] started 3 or more times. [GL #4387]

5
bin/named/server.c
View File

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

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

@@ -65,6 +65,9 @@ Bug Fixes
have been making it ineffective if named was started 3 or more have been making it ineffective if named was started 3 or more
times. :gl:`#4387` 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 Known Issues
~~~~~~~~~~~~ ~~~~~~~~~~~~