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

services: openssh: Fix 'PrintLastLog' default behaviour. 

* gnu/services/ssh.scm (openssh-config-file): Add 'print-last-log?' option.
(<openssh-configuration>)[print-last-log?]: Add it.
(openssh-activation): Touch /var/log/lastlog.
* doc/guix.texi (Networking Services): Document 'print-last-log?'.

Before that, the service did not work as expected because /var/log/lastlog did
not exist.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Clément Lassieur 2017-03-02 22:06:29 +01:00 committed by Danny Milosavljevic
parent 1806a670f0
commit f895dce41b
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -9352,6 +9352,10 @@ Because PAM challenge response authentication usually serves an
equivalent role to password authentication, you should disable either equivalent role to password authentication, you should disable either
@code{challenge-response-authentication?} or @code{challenge-response-authentication?} or
@code{password-authentication?}. @code{password-authentication?}.
@item @code{print-last-log?} (default: @code{#t})
Specifies whether @command{sshd} should print the date and time of the
last user login when a user logs in interactively.
@end table @end table
@end deftp @end deftp

13
gnu/services/ssh.scm
View File

@ -279,6 +279,8 @@ The other options should be self-descriptive."
(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?
(default #t)) ;Boolean
(print-last-log? openssh-configuration-print-last-log?
(default #t))) ;Boolean (default #t))) ;Boolean
(define %openssh-accounts (define %openssh-accounts
@ -298,6 +300,14 @@ The other options should be self-descriptive."
(mkdir-p "/etc/ssh") (mkdir-p "/etc/ssh")
(mkdir-p (dirname #$(openssh-configuration-pid-file config))) (mkdir-p (dirname #$(openssh-configuration-pid-file config)))
(define (touch file-name)
(call-with-output-file file-name (const #t)))
(let ((lastlog "/var/log/lastlog"))
(when #$(openssh-configuration-print-last-log? config)
(unless (file-exists? lastlog)
(touch lastlog))))
;; Generate missing host keys. ;; Generate missing host keys.
(system* (string-append #$(openssh-configuration-openssh config) (system* (string-append #$(openssh-configuration-openssh config)
"/bin/ssh-keygen") "-A"))) "/bin/ssh-keygen") "-A")))
@ -336,6 +346,9 @@ The other options should be self-descriptive."
(format port "UsePAM ~a\n" (format port "UsePAM ~a\n"
#$(if (openssh-configuration-use-pam? config) #$(if (openssh-configuration-use-pam? config)
"yes" "no")) "yes" "no"))
(format port "PrintLastLog ~a\n"
#$(if (openssh-configuration-print-last-log? config)
"yes" "no"))
#t)))) #t))))
(define (openssh-shepherd-service config) (define (openssh-shepherd-service config)