@@ -1433,12 +1433,12 @@ connection problems) with the following options:

 .TP

 .B \-\-sndbuf size

 Set the TCP/UDP socket send buffer size.

-Currently defaults to 65536 bytes.

+Defaults to operation system default.

 .\"*********************************************************

 .TP

 .B \-\-rcvbuf size

 Set the TCP/UDP socket receive buffer size.

-Currently defaults to 65536 bytes.

+Defaults to operation system default.

 .\"*********************************************************

 .TP

 .B \-\-mark value

@@ -785,10 +785,6 @@ init_options (struct options *o, const bool init_gc)

 #ifdef ENABLE_FEATURE_TUN_PERSIST

   o->persist_mode = 1;

 #endif

-#ifndef WIN32

-  o->rcvbuf = 65536;

-  o->sndbuf = 65536;

-#endif

 #ifdef TARGET_LINUX

   o->tuntap_options.txqueuelen = 100;

 #endif

@@ -623,12 +623,9 @@ static void

 socket_set_sndbuf (int sd, int size)

 {

 #if defined(HAVE_SETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_SNDBUF)

-  if (size > 0 && size < SOCKET_SND_RCV_BUF_MAX)

+  if (setsockopt (sd, SOL_SOCKET, SO_SNDBUF, (void *) &size, sizeof (size)) != 0)

     {

-      if (setsockopt (sd, SOL_SOCKET, SO_SNDBUF, (void *) &size, sizeof (size)) != 0)

-	{

-	  msg (M_WARN, "NOTE: setsockopt SO_SNDBUF=%d failed", size);

-	}

+      msg (M_WARN, "NOTE: setsockopt SO_SNDBUF=%d failed", size);

     }

 #endif

 }

@@ -652,13 +649,10 @@ static bool

 socket_set_rcvbuf (int sd, int size)

 {

 #if defined(HAVE_SETSOCKOPT) && defined(SOL_SOCKET) && defined(SO_RCVBUF)

-  if (size > 0 && size < SOCKET_SND_RCV_BUF_MAX)

+  if (setsockopt (sd, SOL_SOCKET, SO_RCVBUF, (void *) &size, sizeof (size)) != 0)

     {

-      if (setsockopt (sd, SOL_SOCKET, SO_RCVBUF, (void *) &size, sizeof (size)) != 0)

-	{

-	  msg (M_WARN, "NOTE: setsockopt SO_RCVBUF=%d failed", size);

-	  return false;

-	}

+      msg (M_WARN, "NOTE: setsockopt SO_RCVBUF=%d failed", size);

+      return false;

     }

   return true;

 #endif

@@ -42,11 +42,6 @@

 #define OPENVPN_PORT "1194"

 /*

- * Maximum size passed passed to setsockopt SNDBUF/RCVBUF

- */

-#define SOCKET_SND_RCV_BUF_MAX 1000000

-

-/*

  * Number of seconds that "resolv-retry infinite"

  * represents.

  */