Fix OSX quick-enroll: stop osqueryd before unload#807
Merged
Conversation
When re-enrolling an OSX node where osqueryd is already running, the quick-add script would fail with "service already loaded" error. The issue was that launchctl unload alone doesn't stop a running service - it only marks it for removal. This caused the subsequent launchctl load to fail. Fixed by adding launchctl stop before unload, ensuring the service is fully stopped before attempting to reload it. Fixes jmpsec#57
launchctl list without sudo only shows user-session services. osqueryd runs as a system LaunchDaemon, so the conditional check always fails for non-root users, leaving the daemon running during re-enrollment. Replace conditional check with unconditional sudo launchctl unload that tolerates failure. Guarantees system-level unload regardless of shell domain.
javuto
approved these changes
May 11, 2026
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
2 participants
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.
Re-enrolling an OSX node with osqueryd already running fails because launchctl unload returns an error when the service is still active. The stopOsquery function on Darwin needs to stop the service before unloading it.
This adds a launchctl stop call before the unload, matching the pattern used on other platforms where the service is stopped before removal.
Fixes #57