SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "shared/pager: add support for more(1) pager in secure mode"

Browse Source
This commit is contained in:
Luca Boccassi
2026-05-16 09:38:25 +09:00
committed by Yu Watanabe
parent ace3a7b500
commit c043b90187
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/pager.c
+2 -9
View File
@@ -206,13 +206,6 @@ void pager_open(PagerFlags flags) {
_exit(EXIT_FAILURE);
}
/* Some pager implementations support the PAGERSECURE environment variable, e.g. more(1) */
r = set_unset_env("PAGERSECURE", use_secure_mode ? "1" : NULL, true);
if (r < 0) {
log_error_errno(r, "Failed to adjust environment variable PAGERSECURE: %m");
_exit(EXIT_FAILURE);
}
if (trust_pager && pager_args) { /* The pager config might be set globally, and we cannot
* know if the user adjusted it to be appropriate for the
* secure mode. Thus, start the pager specified through
@@ -235,8 +228,8 @@ void pager_open(PagerFlags flags) {
static const char* pagers[] = { "pager", "less", "more", "(built-in)" };
for (unsigned i = 0; i < ELEMENTSOF(pagers); i++) {
/* Only less, more (and our trivial fallback) implement secure mode right now. */
if (use_secure_mode && !STR_IN_SET(pagers[i], "less", "more", "(built-in)"))
/* Only less (and our trivial fallback) implement secure mode right now. */
if (use_secure_mode && !STR_IN_SET(pagers[i], "less", "(built-in)"))
continue;
r = loop_write(exe_name_pipe[1], pagers[i], strlen(pagers[i]) + 1);