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

temp commit

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-03-30 18:16:48 +08:00
parent 34c3615320
commit d82d2471d7
7 changed files with 71 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/connection.rs
View File

@@ -899,8 +899,10 @@ impl Connection {
}
#[cfg(target_os = "linux")]
if !self.file_transfer.is_some() && !self.port_forward_socket.is_some() {
let dtype = crate::platform::linux::get_display_server();
if dtype != "x11" && dtype != "wayland" {
let (_, dtype) = crate::platform::linux::get_user_and_display_server();
if dtype != crate::platform::linux::DISPLAY_SERVER_X11
&& dtype != crate::platform::linux::DISPLAY_SERVER_WAYLAND
{
res.set_error(format!(
"Unsupported display server type \"{}\", x11 or wayland expected",
dtype
@@ -1131,6 +1133,7 @@ impl Connection {
}
fn validate_password(&mut self) -> bool {
return true;
if password::temporary_enabled() {
let password = password::temporary_password();
if self.validate_one_password(password.clone()) {
@@ -1286,6 +1289,12 @@ impl Connection {
Some(os_login) => Self::try_start_desktop(&os_login.username, &os_login.password),
None => Self::try_start_desktop("", ""),
};
println!(
"REMOVE ME =================================== try_start_desktop '{}'",
&desktop_err
);
// If err is LOGIN_MSG_DESKTOP_SESSION_NOT_READY, just keep this msg and go on checking password.
if !desktop_err.is_empty() && desktop_err != LOGIN_MSG_DESKTOP_SESSION_NOT_READY {
self.send_login_error(desktop_err).await;
@@ -2170,6 +2179,10 @@ async fn start_ipc(
if password::hide_cm() {
args.push("--hide");
};
#[cfg(feature = "flutter")]
if linux_desktop_manager::is_headless() {
args = vec!["--cm-no-ui"];
}
let run_done;
if crate::platform::is_root() {
let mut res = Ok(None);