From: Ira Cooper <samba@ira.wakeful.net>
Date: Wed, 6 Oct 2010 16:24:27 +0000 (-0400)
Subject:     s3: Adding TCP_KEEPALIVE_THRESHOLD and TCP_KEEPALIVE_ABORT_THRESHOLD to the list... 
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=fdad0328e4ee4de26e94f9b19a74ded83c5b00ce;p=tridge%2Fsamba.git

s3: Adding TCP_KEEPALIVE_THRESHOLD and TCP_KEEPALIVE_ABORT_THRESHOLD to the list of accepted socket settings.

    These are both exclusive to Solaris/OpenSolaris.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Oct  7 00:26:39 UTC 2010 on sn-devel-104
---

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 188e11702e..6782249bf6 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -288,6 +288,12 @@ static const smb_socket_option socket_options[] = {
 #endif
 #ifdef TCP_QUICKACK
   {"TCP_QUICKACK", IPPROTO_TCP, TCP_QUICKACK, 0, OPT_BOOL},
+#endif
+#ifdef TCP_KEEPALIVE_THRESHOLD
+  {"TCP_KEEPALIVE_THRESHOLD", IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD, 0, OPT_INT},
+#endif
+#ifdef TCP_KEEPALIVE_ABORT_THRESHOLD
+  {"TCP_KEEPALIVE_ABORT_THRESHOLD", IPPROTO_TCP, TCP_KEEPALIVE_ABORT_THRESHOLD, 0, OPT_INT},
 #endif
   {NULL,0,0,0,0}};