diff options
author | Mark H Weaver <mhw@netris.org> | 2018-03-20 00:49:05 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-03-20 00:49:05 -0400 |
commit | 647888845c0d7b9ea1b51a3e3492d4d2382f4468 (patch) | |
tree | be34c5ec88db452c63253dc4a15f9f4cf199b1e6 /gnu/services/ssh.scm | |
parent | fe15613cdf8623574ce64c05416dd3fab41eef86 (diff) | |
parent | c657716ede8932da356635802534aa13205a6ecd (diff) | |
download | patches-647888845c0d7b9ea1b51a3e3492d4d2382f4468.tar patches-647888845c0d7b9ea1b51a3e3492d4d2382f4468.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/ssh.scm')
-rw-r--r-- | gnu/services/ssh.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index 301ba74041..f1d2be3f6b 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -302,6 +302,10 @@ The other options should be self-descriptive." (subsystems openssh-configuration-subsystems (default '(("sftp" "internal-sftp")))) + ;; list of strings + (accepted-environment openssh-configuration-accepted-environment + (default '())) + ;; list of user-name/file-like tuples (authorized-keys openssh-authorized-keys (default '())) @@ -430,6 +434,9 @@ of user-name/file-like tuples." (format port "AuthorizedKeysFile \ .ssh/authorized_keys .ssh/authorized_keys2 /etc/ssh/authorized_keys.d/%u\n") + (for-each (lambda (s) (format port "AcceptEnv ~a\n" s)) + '#$(openssh-configuration-accepted-environment config)) + (for-each (match-lambda ((name command) (format port "Subsystem\t~a\t~a\n" name command))) |