summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs-xml/smbdotconf/tuning/socketoptions.xml1
-rw-r--r--lib/util/util_net.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/docs-xml/smbdotconf/tuning/socketoptions.xml b/docs-xml/smbdotconf/tuning/socketoptions.xml
index c0bd785cb78..d2be5148fde 100644
--- a/docs-xml/smbdotconf/tuning/socketoptions.xml
+++ b/docs-xml/smbdotconf/tuning/socketoptions.xml
@@ -71,6 +71,7 @@
<listitem><para>TCP_KEEPALIVE_THRESHOLD *</para></listitem>
<listitem><para>TCP_KEEPALIVE_ABORT_THRESHOLD *</para></listitem>
<listitem><para>TCP_DEFER_ACCEPT *</para></listitem>
+ <listitem><para>TCP_USER_TIMEOUT *</para></listitem>
</itemizedlist>
<para>Those marked with a <emphasis>'*'</emphasis> take an integer
diff --git a/lib/util/util_net.c b/lib/util/util_net.c
index 6cfb35c87a4..ad6ee792084 100644
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -1036,6 +1036,9 @@ static const smb_socket_option socket_options[] = {
#ifdef TCP_DEFER_ACCEPT
{"TCP_DEFER_ACCEPT", IPPROTO_TCP, TCP_DEFER_ACCEPT, 0, OPT_INT},
#endif
+#ifdef TCP_USER_TIMEOUT
+ {"TCP_USER_TIMEOUT", IPPROTO_TCP, TCP_USER_TIMEOUT, 0, OPT_INT},
+#endif
{NULL,0,0,0,0}};
/****************************************************************************