diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-04-12 09:47:48 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-04-12 12:07:56 +0200 |
| commit | d3fb7fbcbbb774b6b7ff7f72fc1c5322229c9b70 (patch) | |
| tree | 90a0eeb5e06fe3e7c098d89a4ef5527c7999c164 | |
| parent | f783e847350ab28c82b135c29414bbe929fc46df (diff) | |
| download | mullvadvpn-d3fb7fbcbbb774b6b7ff7f72fc1c5322229c9b70.tar.xz mullvadvpn-d3fb7fbcbbb774b6b7ff7f72fc1c5322229c9b70.zip | |
Make get_service_info infallible
| -rw-r--r-- | mullvad-daemon/src/system_service.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-daemon/src/system_service.rs b/mullvad-daemon/src/system_service.rs index b8d4245e60..4e0b77cc53 100644 --- a/mullvad-daemon/src/system_service.rs +++ b/mullvad-daemon/src/system_service.rs @@ -228,13 +228,13 @@ pub fn install_service() -> Result<(), InstallError> { let service_manager = ServiceManager::local_computer(None::<&str>, manager_access) .map_err(InstallError::ConnectServiceManager)?; service_manager - .create_service(get_service_info()?, ServiceAccess::empty()) + .create_service(get_service_info(), ServiceAccess::empty()) .map(|_| ()) .map_err(InstallError::CreateService) } -fn get_service_info() -> Result<ServiceInfo> { - Ok(ServiceInfo { +fn get_service_info() -> ServiceInfo { + ServiceInfo { name: OsString::from(SERVICE_NAME), display_name: OsString::from(SERVICE_DISPLAY_NAME), service_type: SERVICE_TYPE, @@ -250,5 +250,5 @@ fn get_service_info() -> Result<ServiceInfo> { ], account_name: None, // run as System account_password: None, - }) + } } |
