ssh: don't add empty PubkeyAcceptedKeyTypes/HostKeyAlgorithms

The options introduced in e2444a4 would generate a broken ssh config when set to an empty list. /etc/ssh/ssh_config line 7: Missing argument.
NixOS · Jul 21, 2018 · 3572f89 · 3572f89
1 parent 153d224
commit 3572f89
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
@@ -211,8 +211,8 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
-        PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}
-        HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}
+        ${optionalString (cfg.pubkeyAcceptedKeyTypes != []) PubkeyAcceptedKeyTypes "${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
+        ${optionalString (cfg.hostKeyAlgorithms != []) HostKeyAlgorithms "${concatStringsSep "," cfg.hostKeyAlgorithms}"}
 
         ${cfg.extraConfig}
       '';