weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

run_as_user use vec arg

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2022-11-27 12:31:53 +08:00
parent 99f41007e9
commit 51cfa6f666
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/connection.rs
View File

@@ -1571,18 +1571,21 @@ async fn start_ipc(
if let Ok(s) = crate::ipc::connect(1000, "_cm").await {
stream = Some(s);
} else {
let extra_args = if password::hide_cm() { "--hide" } else { "" };
let mut args = vec!["--cm"];
if password::hide_cm() {
args.push("--hide");
};
let run_done;
if crate::platform::is_root() {
let mut res = Ok(None);
for _ in 0..10 {
#[cfg(not(target_os = "linux"))]
{
res = crate::platform::run_as_user(&format!("--cm {}", extra_args));
res = crate::platform::run_as_user(args.clone());
}
#[cfg(target_os = "linux")]
{
res = crate::platform::run_as_user(&format!("--cm {}", extra_args), None);
res = crate::platform::run_as_user(args.clone(), None);
}
if res.is_ok() {
break;
@@ -1597,10 +1600,6 @@ async fn start_ipc(
run_done = false;
}
if !run_done {
let mut args = vec!["--cm"];
if !extra_args.is_empty() {
args.push(&extra_args);
}
super::CHILD_PROCESS
.lock()
.unwrap()