kyush/rustdesk-undercover
1
0
Fork 0
forked from mirrors/rustdesk
Code Pull requests Releases 1 Activity Actions

Add advanced option to allow CLI settings when custom client toggles Disable settings (#15138)

Browse source
This commit is contained in:
21pages 2026-05-28 17:52:55 +08:00 • committed by GitHub
commit caadd72ab2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/hbb_common

@ -1 +1 @@
Subproject commit 822701e416a60c97e6f3b23bb0bfa84a2177c57f Subproject commit 2e9f641101c6bfbd1f4ca42a249bef7c14e52f5b

14
src/core_main.rs
View file

@ -432,7 +432,7 @@ pub fn core_main() -> Option<Vec<String>> {
} }
return None; return None;
} else if args[0] == "--password" { } else if args[0] == "--password" {
if config::is_disable_settings() { if is_cli_setting_change_disabled() {
println!("Settings are disabled!"); println!("Settings are disabled!");
return None; return None;
} }
@ -474,7 +474,7 @@ pub fn core_main() -> Option<Vec<String>> {
println!("{}", crate::ipc::get_id()); println!("{}", crate::ipc::get_id());
return None; return None;
} else if args[0] == "--set-id" { } else if args[0] == "--set-id" {
if config::is_disable_settings() { if is_cli_setting_change_disabled() {
println!("Settings are disabled!"); println!("Settings are disabled!");
return None; return None;
} }
@ -521,7 +521,7 @@ pub fn core_main() -> Option<Vec<String>> {
} }
return None; return None;
} else if args[0] == "--option" { } else if args[0] == "--option" {
if config::is_disable_settings() { if is_cli_setting_change_disabled() {
println!("Settings are disabled!"); println!("Settings are disabled!");
return None; return None;
} }
@ -967,6 +967,14 @@ fn is_user_main_ipc_scope_cli_command(args: &[String]) -> bool {
) )
} }
#[inline]
fn is_cli_setting_change_disabled() -> bool {
let option = config::keys::OPTION_ALLOW_COMMAND_LINE_SETTINGS_WHEN_SETTINGS_DISABLED;
let allow_command_line_settings =
config::option2bool(option, &crate::get_builtin_option(option));
config::is_disable_settings() && !allow_command_line_settings
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;