diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-03-05 10:13:12 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-03-06 13:58:02 -0300 |
| commit | 2a8658f0b17ac99b230261d0f98f998e547557cf (patch) | |
| tree | 08e56db9086a91957aaa2c3024086ef7845a4ccb | |
| parent | 0ea0e54f838635c91086fafa0a8a8a7b0166d90e (diff) | |
| download | mullvadvpn-2a8658f0b17ac99b230261d0f98f998e547557cf.tar.xz mullvadvpn-2a8658f0b17ac99b230261d0f98f998e547557cf.zip | |
Rename user_is_root() into running_as_admin()
Making the intention clear in multiple platforms.
| -rw-r--r-- | mullvad-daemon/src/main.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 14b3cf0f6f..821206636d 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -768,8 +768,8 @@ fn run() -> Result<()> { .chain_err(|| "Unable to initialize logger")?; log_version(); - if !user_is_root() { - warn!("Running daemon as a non-root user, clients might refuse to connect"); + if !running_as_admin() { + warn!("Running daemon as a non-administrator user, clients might refuse to connect"); } let resource_dir = config.resource_dir.unwrap_or_else(|| get_resource_dir()); @@ -813,13 +813,13 @@ fn get_resource_dir() -> PathBuf { } #[cfg(unix)] -fn user_is_root() -> bool { +fn running_as_admin() -> bool { let uid = unsafe { libc::getuid() }; uid == 0 } #[cfg(windows)] -fn user_is_root() -> bool { +fn running_as_admin() -> bool { // TODO: Check if user is administrator correctly on Windows. true } |
