Merge pull request #82621 from aanderse/ssh-fix

nixos/sshd: only include AuthorizedKeysCommand and AuthorizedKeysComm…
2020-03-15 00:09:34 +00:00
parent 41742c85ec f383fa344e
commit 58f2d11810
1 changed files with 4 additions and 2 deletions
@@ -505,8 +505,10 @@ in
        PrintMotd no # handled by pam_motd

        AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
-        AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
-        AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
+        ${optionalString (cfg.authorizedKeysCommand != "none") ''
+          AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
+          AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
+        ''}

        ${flip concatMapStrings cfg.hostKeys (k: ''
          HostKey ${k.path}