From 0342ca40629d5a57db02c7f840809dfa0bde6780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
Date: Tue, 30 Oct 2012 11:32:52 +0100
Subject: [PATCH] wfabuild: fix the -errwarn compile flag test

as in the autoconf build this must be "-errwarn=%all"
---
 lib/replace/wscript | 2 +-
 lib/util/util_net.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/replace/wscript b/lib/replace/wscript
index c21a8f87e9d..7c2d5191d79 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -54,7 +54,7 @@ struct foo bar = { .y = 'X', .x = 1 };
             break
 
     # Try to find the right extra flags for -Werror behaviour
-    for f in ["-Werror", "-w2", "-errwarn"]:
+    for f in ["-Werror", "-w2", "-errwarn=%all"]:
         if conf.CHECK_CFLAGS([f], '''
 '''):
             if not 'WERROR_CFLAGS' in conf.env:
diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 83afda4c78e..536c0a4e2b7 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -817,6 +817,9 @@ static const smb_socket_option socket_options[] = {
 #ifdef TCP_QUICKACK
   {"TCP_QUICKACK", IPPROTO_TCP, TCP_QUICKACK, 0, OPT_BOOL},
 #endif
+#ifdef TCP_FASTOPEN
+  {"TCP_FASTOPEN", IPPROTO_TCP, TCP_FASTOPEN, 0, OPT_BOOL},
+#endif
 #ifdef TCP_NODELAYACK
   {"TCP_NODELAYACK", IPPROTO_TCP, TCP_NODELAYACK, 0, OPT_BOOL},
 #endif