[openssh/f16] still support /etc/sysconfig/sshd loading in sshd service (#754732)

[Tomáš Mráz]

commit c33ad09d937192e40ec369bd3a6db4d50e1638c3
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Fri Nov 18 10:04:11 2011 +0100

    still support /etc/sysconfig/sshd loading in sshd service (#754732)
    
    Conflicts:
    
    	openssh.spec

 openssh.spec  |    5 ++++-
 sshd.service  |    5 +++--
 sshd.socket   |    1 +
 sshd at .service |    7 ++++---
 4 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/openssh.spec b/openssh.spec
index 8cd6580..6ef789d 100644
--- a/openssh.spec
+++ b/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 at 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 at redhat.com> - 5.8p2-20 + 0.9.2-31
 - save ssh-askpass's debuginfo
 
diff --git a/sshd.service b/sshd.service
index c694c60..d5a7051 100644
--- a/sshd.service
+++ b/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]
diff --git a/sshd.socket b/sshd.socket
index fd68407..94b9533 100644
--- a/sshd.socket
+++ b/sshd.socket
@@ -1,4 +1,5 @@
 [Unit]
+Description=OpenSSH Server Socket
 Conflicts=sshd.service
 
 [Socket]
diff --git a/sshd at .service b/sshd at .service
index 7e0002f..09f995e 100644
--- a/sshd at .service
+++ b/sshd at .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