oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

move keepalive setting to after setting up sockets

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14233 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-09-21 11:17:41 +00:00
parent 93ac20fb2d
commit 44cb295753
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
appl/rsh/rshd.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997-2003 Kungliga Tekniska H<>gskolan * Copyright (c) 1997-2004 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -972,13 +972,6 @@ main(int argc, char **argv)
do_kerberos = DO_KRB4 | DO_KRB5; do_kerberos = DO_KRB4 | DO_KRB5;
#endif #endif
if (do_keepalive &&
setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
sizeof(on)) < 0)
syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
/* set SO_LINGER? */
#ifdef KRB5 #ifdef KRB5
if((do_kerberos & DO_KRB5) && krb5_init_context (&context) != 0) if((do_kerberos & DO_KRB5) && krb5_init_context (&context) != 0)
do_kerberos &= ~DO_KRB5; do_kerberos &= ~DO_KRB5;
@@ -1035,6 +1028,13 @@ main(int argc, char **argv)
freeaddrinfo(ai); freeaddrinfo(ai);
} }
if (do_keepalive &&
setsockopt(0, SOL_SOCKET, SO_KEEPALIVE, (char *)&on,
sizeof(on)) < 0)
syslog(LOG_WARNING, "setsockopt (SO_KEEPALIVE): %m");
/* set SO_LINGER? */
signal (SIGPIPE, SIG_IGN); signal (SIGPIPE, SIG_IGN);
doit (); doit ();