summaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2017-03-02 22:06:29 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2017-03-10 19:23:45 +0100
commitf895dce41b5495849a7e26fef747db14f6dd4ef0 (patch)
tree852df68bfff5ac499bb0d370a3945515dc30b3c2 /gnu/services
parent1806a670f06bd745e7e3744046f50bb6f9113d26 (diff)
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>
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/ssh.scm13
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index ef7d546d13..d8a3ad35ad 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)