From 26b9ced252dcbf2148c76da5b3a5c37b8c33362a9ba241f9058c59d88d707cda Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Apr 2010 17:29:33 +0000 Subject: [PATCH] Accepting request 38569 from Base:System Copy from Base:System/openssh based on submit request 38569 from user anicka OBS-URL: https://build.opensuse.org/request/show/38569 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=41 --- openssh-askpass-gnome.spec | 2 +- openssh.changes | 5 +++++ openssh.spec | 2 +- sshd.pamd | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec index 386c773..dd5eb71 100644 --- a/openssh-askpass-gnome.spec +++ b/openssh-askpass-gnome.spec @@ -23,7 +23,7 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev License: BSD3c(or similar) Group: Productivity/Networking/SSH Version: 5.4p1 -Release: 2 +Release: 3 Requires: openssh = %{version} openssh-askpass = %{version} AutoReqProv: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH diff --git a/openssh.changes b/openssh.changes index 11e045a..e33f5b6 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 23 12:01:50 CEST 2010 - anicka@suse.cz + +- honour /etc/nologin (bnc#530885) + ------------------------------------------------------------------- Thu Mar 25 11:00:00 CET 2010 - meissner@suse.de diff --git a/openssh.spec b/openssh.spec index cbd7695..69d0c38 100644 --- a/openssh.spec +++ b/openssh.spec @@ -36,7 +36,7 @@ PreReq: pwdutils %insserv_prereq %fillup_prereq coreutils permissions Conflicts: nonfreessh AutoReqProv: on Version: 5.4p1 -Release: 2 +Release: 3 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) Url: http://www.openssh.com/ diff --git a/sshd.pamd b/sshd.pamd index d3dd19d..cf8b0a8 100644 --- a/sshd.pamd +++ b/sshd.pamd @@ -1,6 +1,7 @@ #%PAM-1.0 auth requisite pam_nologin.so auth include common-auth +account requisite pam_nologin.so account include common-account password include common-password session required pam_loginuid.so