root/xz
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2025-12-11 16:08:45 +00:00
Code Issues Releases Wiki Activity

xz: Never translate "Failed to enable the sandbox"

Browse Source 
This was already the case in practice because I had forgotten to list
src/xz/sandbox.c in po/POTFILES.in. However, it seems better to never
translate this particular error message. It should almost never occur
and if it does, an untranslated message is should make it easier to
find bug reports about it.
This commit is contained in:
Lasse Collin 2025-12-09 12:55:45 +02:00
parent 5a7fc1af3d
commit b8af36920b
No known key found for this signature in database
GPG Key ID: 38EE757D69184620
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/xz/sandbox.c
View File

@ -4,6 +4,15 @@
// //
/// \file sandbox.c /// \file sandbox.c
/// \brief Sandbox support /// \brief Sandbox support
///
/// \note When sandbox_init() is called, gettext hasn't been
/// initialized yet, and thus wrapping error messages
/// in _("...") is pointless in that function. In other
/// functions gettext can be used, but the only error message
/// we have is "Failed to enable the sandbox" which should
/// (almost) never occur. If it does occur anyway, leaving
/// the message untranslated can make it easier to find
/// bug reports about the issue.
// //
// Author: Lasse Collin // Author: Lasse Collin
// //
@ -71,11 +80,8 @@ prepare_for_strict_sandbox(void)
extern void extern void
sandbox_init(void) sandbox_init(void)
{ {
if (pledge("stdio rpath wpath cpath fattr", "")) { if (pledge("stdio rpath wpath cpath fattr", ""))
// gettext hasn't been initialized yet so
// there's no point to call it here.
message_fatal("Failed to enable the sandbox"); message_fatal("Failed to enable the sandbox");
}
return; return;
} }
@ -87,7 +93,7 @@ sandbox_enable_read_only(void)
// We will be opening files for reading but // We will be opening files for reading but
// won't create or remove any files. // won't create or remove any files.
if (pledge("stdio rpath", "")) if (pledge("stdio rpath", ""))
message_fatal(_("Failed to enable the sandbox")); message_fatal("Failed to enable the sandbox");
return; return;
} }
@ -103,7 +109,7 @@ sandbox_enable_strict_if_allowed(int src_fd lzma_attribute((__unused__)),
// All files that need to be opened have already been opened. // All files that need to be opened have already been opened.
if (pledge("stdio", "")) if (pledge("stdio", ""))
message_fatal(_("Failed to enable the sandbox")); message_fatal("Failed to enable the sandbox");
return; return;
} }
@ -139,7 +145,7 @@ enable_landlock(uint64_t required_rights)
const int ruleset_fd = my_landlock_create_ruleset( const int ruleset_fd = my_landlock_create_ruleset(
&attr, sizeof(attr), 0); &attr, sizeof(attr), 0);
if (ruleset_fd < 0) if (ruleset_fd < 0)
message_fatal(_("Failed to enable the sandbox")); message_fatal("Failed to enable the sandbox");
// All files we need should have already been opened. Thus, // All files we need should have already been opened. Thus,
// we don't need to add any rules using landlock_add_rule(2) // we don't need to add any rules using landlock_add_rule(2)
@ -154,7 +160,7 @@ enable_landlock(uint64_t required_rights)
// prctl(PR_SET_NO_NEW_PRIVS, ...) was already called in // prctl(PR_SET_NO_NEW_PRIVS, ...) was already called in
// sandbox_init() so we don't do it here again. // sandbox_init() so we don't do it here again.
if (my_landlock_restrict_self(ruleset_fd, 0) != 0) if (my_landlock_restrict_self(ruleset_fd, 0) != 0)
message_fatal(_("Failed to enable the sandbox")); message_fatal("Failed to enable the sandbox");
(void)close(ruleset_fd); (void)close(ruleset_fd);
return; return;
@ -305,7 +311,7 @@ error:
if (errno == ENOSYS) if (errno == ENOSYS)
return; return;
message_fatal(_("Failed to enable the sandbox")); message_fatal("Failed to enable the sandbox");
} }
#endif #endif