lib/util: allow to set TCP_USER_TIMEOUT socket option

BUG: https://bugzilla.samba.org/show_bug.cgi?id=11897

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/docs-xml/smbdotconf/tuning/socketoptions.xml b/docs-xml/smbdotconf/tuning/socketoptions.xml
index c0bd785cb786c4698a56ec64c9c1357fc184acc0..d2be5148fde08f1b33e6acbe68a718a899630c81 100644 (file)
--- 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 6cfb35c87a4a5f3412e70d497d41a2f8df19f7c3..ad6ee79208412b993f0ad1b59ec5bbd597ff225e 100644 (file)
--- a/lib/util/util_net.c
+++ b/lib/util/util_net.c
@@ -1035,6 +1035,9 @@ static const smb_socket_option socket_options[] = {
 #endif
 #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}};