diff options
| author | Damien Miller <djm@mindrot.org> | 2003-12-17 16:31:10 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2003-12-17 16:31:10 +1100 |
| commit | 12c150e7e0711e29ea5dc78d3c9ed46221319dc5 (patch) | |
| tree | 71ac83ddc9424e406a2363c4985fdf67005d909e /sshd.c | |
| parent | 9836cf8d717455f1bba2dfbf2e41f074fc6bac48 (diff) | |
| download | openssh-git-12c150e7e0711e29ea5dc78d3c9ed46221319dc5.tar.gz | |
- markus@cvs.openbsd.org 2003/12/09 21:53:37
[readconf.c readconf.h scp.1 servconf.c servconf.h sftp.1 ssh.1]
[ssh_config.5 sshconnect.c sshd.c sshd_config.5]
rename keepalive to tcpkeepalive; the old name causes too much
confusion; ok djm, dtucker; with help from jmc@
Diffstat (limited to 'sshd.c')
| -rw-r--r-- | sshd.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.283 2003/12/09 17:29:04 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.284 2003/12/09 21:53:37 markus Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -1398,8 +1398,8 @@ main(int ac, char **av) signal(SIGCHLD, SIG_DFL); signal(SIGINT, SIG_DFL); - /* Set keepalives if requested. */ - if (options.keepalives && + /* Set SO_KEEPALIVE if requested. */ + if (options.tcp_keep_alive && setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0) error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno)); |