pyrox.dev / nixpkgs
lol
fork atom

Fix setting programs.ssh.setXAuthLocation

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.

Eelco Dolstra d69dce08 6e08a554

options
unified split
Changed files
+1 -3
nixos
modules
programs
ssh.nix
services
networking
ssh
sshd.nix
+1 -1
nixos/modules/programs/ssh.nix 
···

       
165

       
 

       
  config = {


     

       
166

       
 

       



     

       
167

       
 

       
    programs.ssh.setXAuthLocation =


     

       
168

       
-

       
      mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11);


     

       
169

       
 

       



     

       
170

       
 

       
    assertions =


     

       
171

       
 

       
      [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;


     
···

       
165

       
 

       
  config = {


     

       
166

       
 

       



     

       
167

       
 

       
    programs.ssh.setXAuthLocation =


     

       
168

       
+

       
      mkDefault (config.services.xserver.enable || config.programs.ssh.forwardX11 || config.services.openssh.forwardX11);


     

       
169

       
 

       



     

       
170

       
 

       
    assertions =


     

       
171

       
 

       
      [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
-2
nixos/modules/services/networking/ssh/sshd.nix 
···

       
228

       
 

       



     

       
229

       
 

       
  config = mkIf cfg.enable {


     

       
230

       
 

       



     

       
231

       
-

       
    programs.ssh.setXAuthLocation = mkForce cfg.forwardX11;


     

       
232

       
-

       



     

       
233

       
 

       
    users.extraUsers.sshd =


     

       
234

       
 

       
      { isSystemUser = true;


     

       
235

       
 

       
        description = "SSH privilege separation user";


     
···

       
228

       
 

       



     

       
229

       
 

       
  config = mkIf cfg.enable {


     

       
230

       
 

       



     

       

       

       
     

       

       

       
     

       
231

       
 

       
    users.extraUsers.sshd =


     

       
232

       
 

       
      { isSystemUser = true;


     

       
233

       
 

       
        description = "SSH privilege separation user";