aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2017-03-02 22:06:28 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2017-03-10 19:23:45 +0100
commit1806a670f06bd745e7e3744046f50bb6f9113d26 (patch)
treebe9448af5812f031f4148cbf5c68f96261a55c16
parent563c5d42c954eacc54151d46a04ae14b9dbb1a10 (diff)
downloadguix-1806a670f06bd745e7e3744046f50bb6f9113d26.tar
guix-1806a670f06bd745e7e3744046f50bb6f9113d26.tar.gz
services: openssh: Remove deprecated options.
* gnu/services/ssh.scm (openssh-config-file): Remove them. (<openssh-configuration>)[rsa-authentication?]: Remove it. (<openssh-configuration>)[protocol-number]: Remove it. * doc/guix.texi (Networking Services): Remove them. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
-rw-r--r--doc/guix.texi8
-rw-r--r--gnu/services/ssh.scm10
2 files changed, 0 insertions, 18 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 5aed6771db..21434f6c74 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9332,19 +9332,11 @@ false, users have to use other authentication method.
Authorized public keys are stored in @file{~/.ssh/authorized_keys}.
This is used only by protocol version 2.
-@item @code{rsa-authentication?} (default: @code{#t})
-When true, users may log in using pure RSA authentication. When false,
-users have to use other means of authentication. This is used only by
-protocol 1.
-
@item @code{x11-forwarding?} (default: @code{#f})
When true, forwarding of X11 graphical client connections is
enabled---in other words, @command{ssh} options @option{-X} and
@option{-Y} will work.
-@item @code{protocol-number} (default: @code{2})
-The SSH protocol number to use.
-
@item @code{challenge-response-authentication?} (default: @code{#f})
Specifies whether challenge response authentication is allowed (e.g. via
PAM).
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index 716a0fbbda..ef7d546d13 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -274,12 +274,8 @@ The other options should be self-descriptive."
(default #t))
(public-key-authentication? openssh-configuration-public-key-authentication?
(default #t)) ;Boolean
- (rsa-authentication? openssh-configuration-rsa-authentication? ;Boolean
- (default #t))
(x11-forwarding? openssh-configuration-x11-forwarding? ;Boolean
(default #f))
- (protocol-number openssh-configuration-protocol-number ;integer
- (default 2))
(challenge-response-authentication? openssh-challenge-response-authentication?
(default #f)) ;Boolean
(use-pam? openssh-configuration-use-pam?
@@ -313,9 +309,6 @@ The other options should be self-descriptive."
#~(call-with-output-file #$output
(lambda (port)
(display "# Generated by 'openssh-service'.\n" port)
- (format port "Protocol ~a\n"
- #$(if (eq? (openssh-configuration-protocol-number config) 1)
- "1" "2"))
(format port "Port ~a\n"
#$(number->string (openssh-configuration-port-number config)))
(format port "PermitRootLogin ~a\n"
@@ -332,9 +325,6 @@ The other options should be self-descriptive."
(format port "PubkeyAuthentication ~a\n"
#$(if (openssh-configuration-public-key-authentication? config)
"yes" "no"))
- (format port "RSAAuthentication ~a\n"
- #$(if (openssh-configuration-rsa-authentication? config)
- "yes" "no"))
(format port "X11Forwarding ~a\n"
#$(if (openssh-configuration-x11-forwarding? config)
"yes" "no"))