From 1b2956809659639c5accf8f26ee3143a5305ea4c Mon Sep 17 00:00:00 2001 From: Abdurahman Elmawi Date: Sat, 28 Jun 2025 21:50:57 +0300 Subject: [PATCH] add keyring_file --- builtin/settingtypes.txt | 3 +++ minetest.conf.example | 4 ++++ src/defaultsettings.cpp | 1 + src/script/lua_api/l_settings.cpp | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 2dc07eff8b..30f408ad78 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -2436,6 +2436,9 @@ enable_remote_media_server (Connect to external media server) [client] bool true # Multiplayer Tab. serverlist_file (Serverlist file) [client] string favoriteservers.json +# File in client/ that contains your saved usernames and passwords for Multiplayer +keyring_file (Keyring file) [client] string keyring.json + [*Gamepads] [client] diff --git a/minetest.conf.example b/minetest.conf.example index 29cbb207b8..16dde9d7cd 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -3627,6 +3627,10 @@ # type: string # serverlist_file = favoriteservers.json +# File in client/ that contains your saved usernames and passwords for Multiplayer +# type: string +# keyring_file = keyring.json + ## Gamepads # Enable joysticks. Requires a restart to take effect diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 916ce9e51f..32b2373a1d 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -380,6 +380,7 @@ void set_default_settings() // Main menu settings->setDefault("main_menu_path", ""); settings->setDefault("serverlist_file", "favoriteservers.json"); + settings->setDefault("keyring_file", "keyring.json"); // General font settings settings->setDefault("font_path", porting::getDataPath("fonts" DIR_DELIM "Arimo-Regular.ttf")); diff --git a/src/script/lua_api/l_settings.cpp b/src/script/lua_api/l_settings.cpp index 121670dbe9..753dd7ced1 100644 --- a/src/script/lua_api/l_settings.cpp +++ b/src/script/lua_api/l_settings.cpp @@ -48,7 +48,7 @@ static inline int checkSettingSecurity(lua_State* L, const std::string &name) const char *disallowed[] = { "main_menu_script", "shader_path", "texture_path", "screenshot_path", - "serverlist_file", "serverlist_url", "map-dir", "contentdb_url", + "serverlist_file", "keyring_file", "serverlist_url", "map-dir", "contentdb_url", }; for (const char *name2 : disallowed) { if (name == name2)