[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  efcc76b     s3: Adding TCP_KEEPALIVE_THRESHOLD and TCP_KEEPALIVE_ABORT_THRESHOLD to the list of accepted socket settings.
      from  4945535 tevent: Only call handlers that ask for events

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit efcc76bfe38f85c0c22470972b78fe030a92d95b
Author: Ira Cooper <samba at ira.wakeful.net>
Date:   Wed Oct 6 12:24:27 2010 -0400

        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 at samba.org>
    Autobuild-Date: Thu Oct  7 00:26:39 UTC 2010 on sn-devel-104
    (cherry picked from commit fdad0328e4ee4de26e94f9b19a74ded83c5b00ce)

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/util_sock.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 6aee78c..f4a0d98 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -287,6 +287,12 @@ static const smb_socket_option socket_options[] = {
 #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}};
 
 /****************************************************************************


-- 
Samba Shared Repository