alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix setting programs.ssh.setXAuthLocation

Browse source 
The configuration { services.openssh.enable = true;
services.openssh.forwardX11 = false; } caused
programs.ssh.setXAuthLocation to be set to false, which was not the
intent. The intent is that programs.ssh.setXAuthLocation should be
automatically enabled if needed or if xauth is already available.
This commit is contained in:
Eelco Dolstra 2016-11-21 16:17:35 +01:00
parent 6e08a55474
commit d69dce080d
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/programs/ssh.nix
View file

@ -165,7 +165,7 @@ in
config = {
programs.ssh.setXAuthLocation =
mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11);
mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11);
assertions =
[ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;

2
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -228,8 +228,6 @@ in
config = mkIf cfg.enable {
programs.ssh.setXAuthLocation = mkForce cfg.forwardX11;
users.extraUsers.sshd =
{ isSystemUser = true;
description = "SSH privilege separation user";