From c63e148361cdb2cc4611c97b3fe8ccb07e2d86b2 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 20 Nov 2013 07:03:15 +0100 Subject: [PATCH] testparm: don't warn for TCP_NODELAY in socket options. TCP_NODELAY is set by default, so we should not warn. Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- source3/utils/testparm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index ce853539932..7e49c080642 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -137,13 +137,13 @@ static int do_global_checks(void) (strstr(socket_options, "SO_SNDBUF") || strstr(socket_options, "SO_RCVBUF") || strstr(socket_options, "SO_SNDLOWAT") || - strstr(socket_options, "SO_RCVLOWAT") || - strstr(socket_options, "TCP_NODELAY"))) { + strstr(socket_options, "SO_RCVLOWAT"))) + { fprintf(stderr, "WARNING: socket options = %s\n" "This warning is printed because you set one of the\n" "following options: SO_SNDBUF, SO_RCVBUF, SO_SNDLOWAT,\n" - "SO_RCVLOWAT, TCP_NODELAY\n" + "SO_RCVLOWAT\n" "Modern server operating systems are tuned for\n" "high network performance in the majority of situations;\n" "when you set 'socket options' you are overriding those\n" -- 2.11.4.GIT