Merge branch 'main' into fix/permanent-password-hash

This commit is contained in:
fufesou
2026-03-21 09:10:29 +08:00

View File

@@ -2976,6 +2976,7 @@ pub mod keys {
pub const OPTION_HIDE_PROXY_SETTINGS: &str = "hide-proxy-settings"; pub const OPTION_HIDE_PROXY_SETTINGS: &str = "hide-proxy-settings";
pub const OPTION_HIDE_REMOTE_PRINTER_SETTINGS: &str = "hide-remote-printer-settings"; pub const OPTION_HIDE_REMOTE_PRINTER_SETTINGS: &str = "hide-remote-printer-settings";
pub const OPTION_HIDE_WEBSOCKET_SETTINGS: &str = "hide-websocket-settings"; pub const OPTION_HIDE_WEBSOCKET_SETTINGS: &str = "hide-websocket-settings";
pub const OPTION_HIDE_STOP_SERVICE: &str = "hide-stop-service";
// Connection punch-through options // Connection punch-through options
pub const OPTION_ENABLE_UDP_PUNCH: &str = "enable-udp-punch"; pub const OPTION_ENABLE_UDP_PUNCH: &str = "enable-udp-punch";
@@ -3185,6 +3186,7 @@ pub mod keys {
OPTION_HIDE_PROXY_SETTINGS, OPTION_HIDE_PROXY_SETTINGS,
OPTION_HIDE_REMOTE_PRINTER_SETTINGS, OPTION_HIDE_REMOTE_PRINTER_SETTINGS,
OPTION_HIDE_WEBSOCKET_SETTINGS, OPTION_HIDE_WEBSOCKET_SETTINGS,
OPTION_HIDE_STOP_SERVICE,
OPTION_HIDE_USERNAME_ON_CARD, OPTION_HIDE_USERNAME_ON_CARD,
OPTION_HIDE_HELP_CARDS, OPTION_HIDE_HELP_CARDS,
OPTION_DEFAULT_CONNECT_PASSWORD, OPTION_DEFAULT_CONNECT_PASSWORD,