From 7c3bc5a26e31f3b36a3044ea2afc7c03311ab17f Mon Sep 17 00:00:00 2001 From: djm Date: Thu, 26 May 2005 01:59:32 +0000 Subject: [PATCH] - djm@cvs.openbsd.org 2005/04/06 09:43:59 [sshd.c] avoid harmless logspam by not performing setsockopt() on non-socket; ok markus@ --- ChangeLog | 4 ++++ sshd.c | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d72e4483..00d826ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,10 @@ - (djm) OpenBSD CVS Sync - otto@cvs.openbsd.org 2005/04/05 13:45:31 [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 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] diff --git a/sshd.c b/sshd.c index b3fcc696..7ee2dd68 100644 --- a/sshd.c +++ b/sshd.c @@ -42,7 +42,7 @@ */ #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 #include @@ -1615,18 +1615,17 @@ main(int ac, char **av) signal(SIGCHLD, 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 * not have a key. */ 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_ip = get_remote_ipaddr(); -- 2.45.2