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

diff --git a/README b/README
index 30bb9ee5116d85f076a1ec0450cef77066c708ae..1cae26ba3a5f6aaebc4503e5b5d279bee7383684 100644 (file)
--- a/README
+++ b/README
@@ -264,9 +264,9 @@ REQUIREMENTS:
         During runtime, you need the following additional
         dependencies:
 
-        util-linux >= v2.42 required (including but not limited to: mount,
-                                      umount, swapon, swapoff, sulogin,
-                                      agetty, fsck, more)
+        util-linux >= v2.27.1 required (including but not limited to: mount,
+                                        umount, swapon, swapoff, sulogin,
+                                        agetty, fsck)
         dbus >= 1.4.0 (strictly speaking optional, but recommended)
                 NOTE: If using dbus < 1.9.18, you should override the default
                 policy directory (--with-dbuspolicydir=/etc/dbus-1/system.d).

diff --git a/man/common-variables.xml b/man/common-variables.xml
index 74463c23d6083b2d573c4f3ac53ffabefb2c415a..0f807b2cde1d2eca24051f50c17d546e01f2d356 100644 (file)
--- a/man/common-variables.xml
+++ b/man/common-variables.xml
@@ -190,14 +190,11 @@
       allowing untrusted users to execute commands with elevated privileges.</para>
 
       <para>This option takes a boolean argument. When set to true, the "secure mode" of the pager is
-      enabled. In "secure mode", <option>LESSSECURE=1</option> and <option>PAGERSECURE=1</option> will be set
-      when invoking the pager, which instructs the pager to disable commands that open or create new files or
-      start new subprocesses.
+      enabled. In "secure mode", <option>LESSSECURE=1</option> will be set when invoking the pager, which
+      instructs the pager to disable commands that open or create new files or start new subprocesses.
       Currently only <citerefentry
-      project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> and
-      <citerefentry
-      project='man-pages'><refentrytitle>more</refentrytitle><manvolnum>1</manvolnum></citerefentry> are known
-      to understand these variables, respectively, and implement "secure mode".</para>
+      project='man-pages'><refentrytitle>less</refentrytitle><manvolnum>1</manvolnum></citerefentry> is known
+      to understand this variable and implement "secure mode".</para>
 
       <para>When set to false, no limitation is placed on the pager. Setting
       <varname>SYSTEMD_PAGERSECURE=0</varname> or not removing it from the inherited environment may allow

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 61718aeaa6807d2b5799d5acb948f43ee79de683..3c89aacab48d026dbff6f3f0edb9c883cfd23232 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -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);