fix

Author: phillyqueso

Cargo.lock

@@ -34,6 +34,7 @@ tracing-subscriber = "0.3"
 [target.'cfg(not(any(target_os="windows", target_os="ios", target_os="android")))'.dependencies]
 clap = { version = "2.33", default-features = false, features = ["suggestions"], optional = true }
 daemonize = { version = "0.4.1", optional = true }
+nix = "0.23.1"
 
 [target.'cfg(target_os="android")'.dependencies]
 jni = "0.19.0"

Cargo.toml

@@ -5,23 +5,35 @@ use crate::device::errno_str;
 use crate::device::Error;
 use libc::*;
 
+#[cfg(target_os = "macos")]
+use nix::unistd::User;
+
 pub fn get_saved_ids() -> Result<(uid_t, gid_t), Error> {
     // Get the user name of the sudoer
-    let uname = unsafe { getlogin() };
-    if uname.is_null() {
-        return Err(Error::DropPrivileges("NULL from getlogin".to_owned()));
+    #[cfg(target_os = "macos")]
+    {
+        let uname: &'static str = env!("USER");
+        let user = User::from_name(uname).unwrap().expect("a user");
+        return Ok((uid_t::from(user.uid), gid_t::from(user.gid)));
     }
-    let userinfo = unsafe { getpwnam(uname) };
-    if userinfo.is_null() {
-        return Err(Error::DropPrivileges("NULL from getpwnam".to_owned()));
+    #[cfg(not(target_os = "macos"))]
+    {
+        let uname = unsafe { getlogin() };
+        if uname.is_null() {
+            return Err(Error::DropPrivileges("NULL from getlogin".to_owned()));
+        }
+        let userinfo = unsafe { getpwnam(uname) };
+        if userinfo.is_null() {
+            return Err(Error::DropPrivileges("NULL from getpwnam".to_owned()));
+        }
+
+        // Saved group ID
+        let saved_gid = unsafe { (*userinfo).pw_gid };
+        // Saved user ID
+        let saved_uid = unsafe { (*userinfo).pw_uid };
+
+        return Ok((saved_uid, saved_gid))
     }
-
-    // Saved group ID
-    let saved_gid = unsafe { (*userinfo).pw_gid };
-    // Saved user ID
-    let saved_uid = unsafe { (*userinfo).pw_uid };
-
-    Ok((saved_uid, saved_gid))
 }
 
 pub fn drop_privileges() -> Result<(), Error> {