tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2005/04/06 09:43:59 

[sshd.c]
     avoid harmless logspam by not performing setsockopt() on non-socket;
     ok markus@
This commit is contained in:
Damien Miller 2005-05-26 11:59:32 +10:00
parent 9278ffaf71
commit 4f1d6b2c11
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -4,6 +4,10 @@
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
- otto@cvs.openbsd.org 2005/04/05 13:45:31 - otto@cvs.openbsd.org 2005/04/05 13:45:31
[ssh-keygen.c] [ssh-keygen.c]
- djm@cvs.openbsd.org 2005/04/06 09:43:59
[sshd.c]
avoid harmless logspam by not performing setsockopt() on non-socket;
ok markus@
20050524 20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@ -2503,4 +2507,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3762 2005/05/26 01:59:06 djm Exp $ $Id: ChangeLog,v 1.3763 2005/05/26 01:59:32 djm Exp $

13
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.308 2005/02/08 22:24:57 dtucker Exp $"); RCSID("$OpenBSD: sshd.c,v 1.309 2005/04/06 09:43:59 djm Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -1615,18 +1615,17 @@ main(int ac, char **av)
signal(SIGCHLD, SIG_DFL); signal(SIGCHLD, SIG_DFL);
signal(SIGINT, SIG_DFL); signal(SIGINT, SIG_DFL);
/* 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));
/* /*
* Register our connection. This turns encryption off because we do * Register our connection. This turns encryption off because we do
* not have a key. * not have a key.
*/ */
packet_set_connection(sock_in, sock_out); packet_set_connection(sock_in, sock_out);
/* Set SO_KEEPALIVE if requested. */
if (options.tcp_keep_alive && packet_connection_is_on_socket() &&
setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0)
error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));
remote_port = get_remote_port(); remote_port = get_remote_port();
remote_ip = get_remote_ipaddr(); remote_ip = get_remote_ipaddr();