Merge pull request #133557 from SuperSandro2000/SuperSandro2000-patch-1

nixos/ssh: cleanup X11Forwarding setting
2021-08-11 17:18:48 -06:00 · 2021-08-11 17:18:48 -06:00 · 90016afdb1
parent 52c2961a1b cbf6bbac91
commit 90016afdb1
1 changed files with 1 additions and 5 deletions
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@ -520,11 +520,7 @@ in
            XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
        ''}

-        ${if cfg.forwardX11 then ''
-          X11Forwarding yes
-        '' else ''
-          X11Forwarding no
-        ''}
+        X11Forwarding ${if cfg.forwardX11 then "yes" else "no"}

        ${optionalString cfg.allowSFTP ''
          Subsystem sftp ${cfg.sftpServerExecutable} ${concatStringsSep " " cfg.sftpFlags}