- updated init script for new limits support in rc-scripts

- moved "ldap" mark from version to release
- release 4

Changed files:
    openssh.spec -> 1.163
    opensshd.init -> 1.19

diff --git a/openssh.spec b/openssh.spec
index c3f2af2b6e7a5d678358c2566e46c374fb294f58..fb9ca418f1020977e03e46ba4ea289f5f4124d41 100644 (file)
--- a/openssh.spec
+++ b/openssh.spec
@@ -3,7 +3,7 @@
 # _without_gnome       - without gnome-askpass utility
 # _without_gtk         - without gtk (2.x)
 # _with_ldap           - with ldap support
-# _with_kerberos5              - with kerberos5 support
+# _with_kerberos5      - with kerberos5 support
 #
 # default to gtk2-based gnome-askpass
 
@@ -21,8 +21,8 @@ Summary(pt_BR):       Implementa
 Summary(ru):   OpenSSH - Ó×ÏÂÏÄÎÁÑ ÒÅÁÌÉÚÁÃÉÑ ÐÒÏÔÏËÏÌÁ Secure Shell (SSH)
 Summary(uk):   OpenSSH - צÌØÎÁ ÒÅÁ̦ÚÁÃ¦Ñ ÐÒÏÔÏËÏÌÕ Secure Shell (SSH)
 Name:          openssh
-Version:       3.6.1p2%{?_with_ldap:ldap}
-Release:       3.2
+Version:       3.6.1p2
+Release:       4%{?_with_ldap:ldap}
 Epoch:         2
 License:       BSD
 Group:         Applications/Networking
@@ -42,7 +42,7 @@ Patch3:               %{name}-pam_misc.patch
 Patch4:                %{name}-sigpipe.patch
 # http://ldappubkey.gcu-squad.org/
 Patch5:                ldappubkey-ossh3.6-v2.patch
-Patch6:                openssh-heimdal.patch
+Patch6:                %{name}-heimdal.patch
 URL:           http://www.openssh.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -56,8 +56,8 @@ BuildRequires:        pam-devel
 BuildRequires: %{__perl}
 %{!?_without_gtk:BuildRequires:        pkgconfig}
 BuildRequires: zlib-devel
-PreReq:                openssl >= 0.9.7
 PreReq:                FHS >= 2.1-24
+PreReq:                openssl >= 0.9.7
 Obsoletes:     ssh
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -251,10 +251,10 @@ Summary(ru):      OpenSSH - 
 Summary(uk):   OpenSSH - ÓÅÒ×ÅÒ ÐÒÏÔÏËÏÌÕ Secure Shell (sshd)
 Group:         Networking/Daemons
 PreReq:                %{name} = %{epoch}:%{version}
-PreReq:                rc-scripts >= 0.3.1-3
+PreReq:                rc-scripts >= 0.3.1-14
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
-Requires(post):        /sbin/chkconfig
+Requires(post,preun):  /sbin/chkconfig
 Requires(post):        chkconfig >= 0.9
 Requires(post):        grep
 Requires(postun):      /usr/sbin/userdel

diff --git a/opensshd.init b/opensshd.init
index d4ba59676508dbaa03a14b1eae187b29687b57c9..ff35e0b75a65dacb8b4bc8523891f4eb4229e83a 100644 (file)
--- a/opensshd.init
+++ b/opensshd.init
@@ -15,6 +15,9 @@
 # Get network config
 . /etc/sysconfig/network
 
+SERVICE_LIMITS_HARD="-u unlimited"
+SERVICE_LIMITS_SOFT="-c 0"
+
 # Get service config
 [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd
 
@@ -55,7 +58,6 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/sshd ]; then
                msg_starting OpenSSH
-               ULIMIT_C="-S -c 0"
                daemon /usr/sbin/sshd 
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sshd