diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh_config.5 | 3 | ||||
-rw-r--r-- | sshd_config.5 | 3 |
3 files changed, 8 insertions, 3 deletions
@@ -233,6 +233,9 @@ | |||
233 | [canohost.c] | 233 | [canohost.c] |
234 | log the originating address and not just the name when a reverse | 234 | log the originating address and not just the name when a reverse |
235 | mapping check fails, requested by linux AT linuon.com | 235 | mapping check fails, requested by linux AT linuon.com |
236 | - markus@cvs.openbsd.org 2006/03/14 16:32:48 | ||
237 | [ssh_config.5 sshd_config.5] | ||
238 | *AliveCountMax applies to protcol v2 only; ok dtucker, djm | ||
236 | 239 | ||
237 | 20060313 | 240 | 20060313 |
238 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 241 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4134,4 +4137,4 @@ | |||
4134 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4137 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4135 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4138 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4136 | 4139 | ||
4137 | $Id: ChangeLog,v 1.4205 2006/03/15 01:06:41 djm Exp $ | 4140 | $Id: ChangeLog,v 1.4206 2006/03/15 01:06:55 djm Exp $ |
diff --git a/ssh_config.5 b/ssh_config.5 index f7c9f7145..5b02ef821 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.88 2006/03/13 10:14:29 dtucker Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.89 2006/03/14 16:32:48 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -845,6 +845,7 @@ If, for example, | |||
845 | .Cm ServerAliveCountMax | 845 | .Cm ServerAliveCountMax |
846 | is left at the default, if the server becomes unresponsive, | 846 | is left at the default, if the server becomes unresponsive, |
847 | ssh will disconnect after approximately 45 seconds. | 847 | ssh will disconnect after approximately 45 seconds. |
848 | This option applies to protocol version 2 only. | ||
848 | .It Cm ServerAliveInterval | 849 | .It Cm ServerAliveInterval |
849 | Sets a timeout interval in seconds after which if no data has been received | 850 | Sets a timeout interval in seconds after which if no data has been received |
850 | from the server, | 851 | from the server, |
diff --git a/sshd_config.5 b/sshd_config.5 index 1bd3a624f..aad28f4c8 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd_config.5,v 1.56 2006/03/13 10:14:29 dtucker Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.57 2006/03/14 16:32:48 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -223,6 +223,7 @@ If | |||
223 | .Cm ClientAliveCountMax | 223 | .Cm ClientAliveCountMax |
224 | is left at the default, unresponsive SSH clients | 224 | is left at the default, unresponsive SSH clients |
225 | will be disconnected after approximately 45 seconds. | 225 | will be disconnected after approximately 45 seconds. |
226 | This option applies to protocol version 2 only. | ||
226 | .It Cm ClientAliveInterval | 227 | .It Cm ClientAliveInterval |
227 | Sets a timeout interval in seconds after which if no data has been received | 228 | Sets a timeout interval in seconds after which if no data has been received |
228 | from the client, | 229 | from the client, |