diff options
| author | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2011-01-24 11:46:57 +0000 |
| commit | 0970072c89b079b022538e3c366fbfa2c53fc821 (patch) | |
| tree | b7024712d74234bb5a8b036ccbc9109e2e211296 /contrib/redhat | |
| parent | 4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff) | |
| parent | 478ff799463ca926a8dfbabf058f4e84aaffc65a (diff) | |
merge 5.7p1
Diffstat (limited to 'contrib/redhat')
| -rw-r--r-- | contrib/redhat/openssh.spec | 2 | ||||
| -rwxr-xr-x | contrib/redhat/sshd.init | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 77e66252e..8fc76b625 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | %define ver 5.6p1 | 1 | %define ver 5.7p1 |
| 2 | %define rel 1 | 2 | %define rel 1 |
| 3 | 3 | ||
| 4 | # OpenSSH privilege separation requires a user & group ID | 4 | # OpenSSH privilege separation requires a user & group ID |
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init index e5d837cbc..854aff665 100755 --- a/contrib/redhat/sshd.init +++ b/contrib/redhat/sshd.init | |||
| @@ -104,7 +104,7 @@ start() | |||
| 104 | do_dsa_keygen | 104 | do_dsa_keygen |
| 105 | 105 | ||
| 106 | echo -n $"Starting $prog:" | 106 | echo -n $"Starting $prog:" |
| 107 | initlog -c "$SSHD $OPTIONS" && success || failure | 107 | $SSHD $OPTIONS && success || failure |
| 108 | RETVAL=$? | 108 | RETVAL=$? |
| 109 | [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd | 109 | [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd |
| 110 | echo | 110 | echo |