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

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  d809158 s3: allow to set TCP_NODELAYACK socket option on AIX (#8616)
      from  b0e5fb6 s3/packaging: Fix rpm build issues on RHEL4.

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


- Log -----------------------------------------------------------------
commit d8091581f7e55a8147c9ec5e8a30481596093d27
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Nov 18 13:40:17 2011 +0100

    s3: allow to set TCP_NODELAYACK socket option on AIX (#8616)
    
    this is the AIX way to disable delayed ACKs, the same like TCP_QUICKACK on
    Linux
    
    this is a backport of 383a918322c1edd1977fdbce19e52e8c8e6ffac1

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

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 6ba1ab9..40e6e04 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -137,6 +137,9 @@ static const smb_socket_option socket_options[] = {
 #ifdef TCP_QUICKACK
   {"TCP_QUICKACK", IPPROTO_TCP, TCP_QUICKACK, 0, OPT_BOOL},
 #endif
+#ifdef TCP_NODELAYACK
+  {"TCP_NODELAYACK", IPPROTO_TCP, TCP_NODELAYACK, 0, OPT_BOOL},
+#endif
 #ifdef TCP_KEEPALIVE_THRESHOLD
   {"TCP_KEEPALIVE_THRESHOLD", IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD, 0, OPT_INT},
 #endif


-- 
Samba Shared Repository