[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: services: openssh: Fix 'PrintLastLog' default behaviour.
From: |
Danny Milosavljevic |
Subject: |
03/03: services: openssh: Fix 'PrintLastLog' default behaviour. |
Date: |
Fri, 10 Mar 2017 13:24:58 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit f895dce41b5495849a7e26fef747db14f6dd4ef0
Author: Clément Lassieur <address@hidden>
Date: Thu Mar 2 22:06:29 2017 +0100
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 <address@hidden>
---
doc/guix.texi | 4 ++++
gnu/services/ssh.scm | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff --git a/doc/guix.texi b/doc/guix.texi
index 21434f6..966a545 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9352,6 +9352,10 @@ Because PAM challenge response authentication usually
serves an
equivalent role to password authentication, you should disable either
@code{challenge-response-authentication?} or
@code{password-authentication?}.
+
address@hidden @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 deftp
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index ef7d546..d8a3ad3 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -279,6 +279,8 @@ The other options should be self-descriptive."
(challenge-response-authentication?
openssh-challenge-response-authentication?
(default #f)) ;Boolean
(use-pam? openssh-configuration-use-pam?
+ (default #t)) ;Boolean
+ (print-last-log? openssh-configuration-print-last-log?
(default #t))) ;Boolean
(define %openssh-accounts
@@ -298,6 +300,14 @@ The other options should be self-descriptive."
(mkdir-p "/etc/ssh")
(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.
(system* (string-append #$(openssh-configuration-openssh config)
"/bin/ssh-keygen") "-A")))
@@ -336,6 +346,9 @@ The other options should be self-descriptive."
(format port "UsePAM ~a\n"
#$(if (openssh-configuration-use-pam? config)
"yes" "no"))
+ (format port "PrintLastLog ~a\n"
+ #$(if (openssh-configuration-print-last-log? config)
+ "yes" "no"))
#t))))
(define (openssh-shepherd-service config)