Fix compilation against naemon-core 1.5.1#174
Open
eschoeller wants to merge 1 commit intoITRS-Group:masterfrom
Open
Fix compilation against naemon-core 1.5.1#174eschoeller wants to merge 1 commit intoITRS-Group:masterfrom
eschoeller wants to merge 1 commit intoITRS-Group:masterfrom
Conversation
Naemon-core 1.5.1 adds a check_timeout parameter to both setup_host_variables() and setup_service_variables(). The new field is inserted after initial_state in the host and service structs. Without this fix, merlin fails to compile against naemon-core 1.5.1: module/oconfsplit.c:222:3: error: too few arguments to function 'setup_service_variables' Add h->check_timeout and s->check_timeout to the respective function calls in oconfsplit.c. Also fixes a minor whitespace issue in the setup_host_variables call (h-> initial_state -> h->initial_state). Ref: https://www.naemon.io/news/2026-03-19-release-1.5.1 Ref: https://github.com/naemon/naemon-core/releases/tag/v1.5.1
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Naemon-core 1.5.1 (released 2026-03-19) adds a
check_timeoutattribute to the host and service structs, allowing per-object timeout overrides. The newint check_timeoutfield is inserted betweeninitial_stateandcheck_intervalin bothstruct hostandstruct service, and thesetup_host_variables()andsetup_service_variables()function signatures are updated to include it as a parameter.This breaks merlin compilation against naemon-core 1.5.1 headers:
This PR adds
h->check_timeoutands->check_timeoutto the respective function calls inmodule/oconfsplit.c. These are the only two call sites for these functions in the merlin codebase.Also fixes a minor whitespace issue in the
setup_host_variablescall (h-> initial_state->h->initial_state).Testing:
Note: Our deployment does not use the
oconfsplitconfig splitting functionality — we distribute config via a separate git-based workflow. The fix is straightforward (passing the new struct field to the function call), but we have not been able to functionally test the oconfsplit code path itself.Refs: