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

Conflicts:

	openssh.spec

openssh.spec

@@ -79,7 +79,7 @@
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
 %define openssh_ver 5.8p2
-%define openssh_rel 20
+%define openssh_rel 21
 %define pam_ssh_agent_ver 0.9.2
 %define pam_ssh_agent_rel 31
 
@@ -771,6 +771,9 @@ fi
 %endif
 
 %changelog
+* Fri Nov 18 2011 Tomas Mraz <tmraz@redhat.com> - 5.8p2-21 + 0.9.2-31
+- still support /etc/sysconfig/sshd loading in sshd service (#754732)
+
 * Tue Aug  9 2011 Jan F. Chadima <jchadima@redhat.com> - 5.8p2-20 + 0.9.2-31
 - save ssh-askpass's debuginfo
 

sshd.service

@@ -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]

sshd.socket

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

sshd@.service

@@ -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