- updated init scripts for new rc-scripts-ulimits.patch, release 6

Changed files:
    openssh.spec -> 1.166
    opensshd.init -> 1.21

diff --git a/openssh.spec b/openssh.spec
index a8bff6e43e82f3f7b77e9dfd7867d5fc01249ce7..e20a6c7ed9773a48929247337df1ca7c96c54c0d 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -22,7 +22,7 @@ Summary(ru):  OpenSSH - 
 Summary(uk):   OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:          openssh
 Version:       3.6.1p2
-Release:       5%{?_with_ldap:ldap}
+Release:       6%{?_with_ldap:ldap}
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -255,7 +255,7 @@ Summary(ru):        OpenSSH - 
 Summary(uk):   OpenSSH - ÓÅÒ×ÅÒ ÐÒÏÔÏËÏÌÕ Secure Shell (sshd)
 Group:         Networking/Daemons
 PreReq:                %{name} = %{epoch}:%{version}
-PreReq:                rc-scripts >= 0.3.1-14
+PreReq:                rc-scripts >= 0.3.1-15
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
 Requires(post,preun):  /sbin/chkconfig

diff --git a/opensshd.init b/opensshd.init
index ae53c43553252137a0d8b53c024090ce1989a58e..49bdcf6c742c8671c3ad77d177240c265362a95f 100644 (file)
--- a/opensshd.init
+++ b/opensshd.init
@@ -15,8 +15,7 @@
 # Get network config
 . /etc/sysconfig/network
 
-SERVICE_LIMITS_HARD="-u unlimited"
-SERVICE_LIMITS_SOFT="-u unlimited -c 0"
+SERVICE_LIMITS="-u unlimited -Sc 0"
 
 # Get service config
 [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd