still support /etc/sysconfig/sshd loading in sshd service (#754732)

This commit is contained in:
Tomas Mraz 2011-11-18 09:20:54 +01:00
parent 0fcb25a8d2
commit 17eb1038b2
4 changed files with 12 additions and 6 deletions

View File

@ -75,7 +75,7 @@
# Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
%define openssh_ver 5.9p1
%define openssh_rel 11
%define openssh_rel 12
%define pam_ssh_agent_ver 0.9.2
%define pam_ssh_agent_rel 32
@ -782,6 +782,9 @@ fi
%endif
%changelog
* Fri Nov 18 2011 Tomas Mraz <tmraz@redhat.com> - 5.9p1-12 + 0.9.2-32
- still support /etc/sysconfig/sshd loading in sshd service (#754732)
* Fri Oct 14 2011 Tomas Mraz <tmraz@redhat.com> - 5.9p1-11 + 0.9.2-32
- remove unnecessary requires on initscripts
- set VerifyHostKeyDNS to ask in the default configuration (#739856)

View File

@ -1,9 +1,10 @@
[Unit]
Description=OpenSSH server daemon.
Description=OpenSSH server daemon
After=syslog.target network.target auditd.service
[Service]
ExecStart=/usr/sbin/sshd -D
EnvironmentFile=/etc/sysconfig/sshd
ExecStart=/usr/sbin/sshd -D $OPTIONS
ExecReload=/bin/kill -HUP $MAINPID
[Install]

View File

@ -1,4 +1,5 @@
[Unit]
Description=OpenSSH Server Socket
Conflicts=sshd.service
[Socket]

View File

@ -1,7 +1,8 @@
[Unit]
Description=OpenSSH per-connection server daemon.
After=syslog.target
Description=OpenSSH per-connection server daemon
After=syslog.target auditd.service
[Service]
ExecStart=-/usr/sbin/sshd -i
EnvironmentFile=/etc/sysconfig/sshd
ExecStart=-/usr/sbin/sshd -i $OPTIONS
StandardInput=socket