summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2026-04-17 13:22:30 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2026-04-17 13:22:38 +0200
commit5979f40c4f4983f04848200205df8ee5f525d461 (patch)
tree7e1d083f4f1071d31fb2d5b023c46eee5e0b0f47
parent720284b694a90824323ad9f8013f0253786bc4e7 (diff)
downloadmullvadvpn-prepare-2026.2.tar.xz
mullvadvpn-prepare-2026.2.zip
Revert "Merge branch 'macos-log-daemon-auth-fail'"prepare-2026.2
This reverts commit 720284b694a90824323ad9f8013f0253786bc4e7.
-rw-r--r--desktop/packages/mullvad-vpn/src/main/index.ts1
-rw-r--r--mullvad-daemon/src/macos_launch_daemon.rs7
2 files changed, 1 insertions, 7 deletions
diff --git a/desktop/packages/mullvad-vpn/src/main/index.ts b/desktop/packages/mullvad-vpn/src/main/index.ts
index 0072c6c9ec..cc340ba8e2 100644
--- a/desktop/packages/mullvad-vpn/src/main/index.ts
+++ b/desktop/packages/mullvad-vpn/src/main/index.ts
@@ -1112,7 +1112,6 @@ class ApplicationMain
} else {
log.error(
`Error while checking launch daemon authorization status.
- Status: ${error.code}
Stdout: ${stdout.toString()}
Stderr: ${stderr.toString()}`,
);
diff --git a/mullvad-daemon/src/macos_launch_daemon.rs b/mullvad-daemon/src/macos_launch_daemon.rs
index c831a14c19..080e771565 100644
--- a/mullvad-daemon/src/macos_launch_daemon.rs
+++ b/mullvad-daemon/src/macos_launch_daemon.rs
@@ -49,19 +49,14 @@ fn get_status_for_url(url: &NSURL) -> LaunchDaemonStatus {
// (1.) is upheld by the virtue of url being a reference, since references are always valid.
// (2.) is trivially upheld since Apple does not state safety requirements.
let status = unsafe { SMAppService::statusForLegacyURL(url) };
- let log_status = || log::debug!("SMAppService::statusForLegacyUrl returned {status:?}");
match status {
SMAppServiceStatus::NotRegistered | SMAppServiceStatus::NotFound => {
- log_status();
LaunchDaemonStatus::NotFound
}
SMAppServiceStatus::Enabled => LaunchDaemonStatus::Ok,
SMAppServiceStatus::RequiresApproval => LaunchDaemonStatus::NotAuthorized,
// Unknown status
- _ => {
- log_status();
- LaunchDaemonStatus::Unknown
- }
+ _ => LaunchDaemonStatus::Unknown,
}
}