nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Clément Lassieur 2017-03-02 22:06:28 +01:00 committed by Danny Milosavljevic
parent 563c5d42c9
commit 1806a670f0
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/guix.texi
View File

@ -9332,19 +9332,11 @@ false, users have to use other authentication method.
Authorized public keys are stored in @file{~/.ssh/authorized_keys}. Authorized public keys are stored in @file{~/.ssh/authorized_keys}.
This is used only by protocol version 2. 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}) @item @code{x11-forwarding?} (default: @code{#f})
When true, forwarding of X11 graphical client connections is When true, forwarding of X11 graphical client connections is
enabled---in other words, @command{ssh} options @option{-X} and enabled---in other words, @command{ssh} options @option{-X} and
@option{-Y} will work. @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}) @item @code{challenge-response-authentication?} (default: @code{#f})
Specifies whether challenge response authentication is allowed (e.g. via Specifies whether challenge response authentication is allowed (e.g. via
PAM). PAM).

10
gnu/services/ssh.scm
View File

@ -274,12 +274,8 @@ The other options should be self-descriptive."
(default #t)) (default #t))
(public-key-authentication? openssh-configuration-public-key-authentication? (public-key-authentication? openssh-configuration-public-key-authentication?
(default #t)) ;Boolean (default #t)) ;Boolean
(rsa-authentication? openssh-configuration-rsa-authentication? ;Boolean
(default #t))
(x11-forwarding? openssh-configuration-x11-forwarding? ;Boolean (x11-forwarding? openssh-configuration-x11-forwarding? ;Boolean
(default #f)) (default #f))
(protocol-number openssh-configuration-protocol-number ;integer
(default 2))
(challenge-response-authentication? openssh-challenge-response-authentication? (challenge-response-authentication? openssh-challenge-response-authentication?
(default #f)) ;Boolean (default #f)) ;Boolean
(use-pam? openssh-configuration-use-pam? (use-pam? openssh-configuration-use-pam?
@ -313,9 +309,6 @@ The other options should be self-descriptive."
#~(call-with-output-file #$output #~(call-with-output-file #$output
(lambda (port) (lambda (port)
(display "# Generated by 'openssh-service'.\n" 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" (format port "Port ~a\n"
#$(number->string (openssh-configuration-port-number config))) #$(number->string (openssh-configuration-port-number config)))
(format port "PermitRootLogin ~a\n" (format port "PermitRootLogin ~a\n"
@ -332,9 +325,6 @@ The other options should be self-descriptive."
(format port "PubkeyAuthentication ~a\n" (format port "PubkeyAuthentication ~a\n"
#$(if (openssh-configuration-public-key-authentication? config) #$(if (openssh-configuration-public-key-authentication? config)
"yes" "no")) "yes" "no"))
(format port "RSAAuthentication ~a\n"
#$(if (openssh-configuration-rsa-authentication? config)
"yes" "no"))
(format port "X11Forwarding ~a\n" (format port "X11Forwarding ~a\n"
#$(if (openssh-configuration-x11-forwarding? config) #$(if (openssh-configuration-x11-forwarding? config)
"yes" "no")) "yes" "no"))