X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;fp=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=d3ee890aece3de108b9bc80bbb8ff4d6252220cb;hb=eb3062d2ef0b5adcf65185c5c9a041c47bdf3ccb;hp=edf7f1b859bc38301fef9b59a50917de3fb52c09;hpb=559436b99b35478dc3e68ff61c42feeea2f676a5;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index edf7f1b85..d3ee890ae 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2211,10 +2211,12 @@ static void *thread_registration_apps(void *data)
 					 * lttcomm_setsockopt_snd_timeout expect msec as
 					 * parameter.
 					 */
-					(void) lttcomm_setsockopt_rcv_timeout(sock,
-							app_socket_timeout * 1000);
-					(void) lttcomm_setsockopt_snd_timeout(sock,
-							app_socket_timeout * 1000);
+					if (app_socket_timeout >= 0) {
+						(void) lttcomm_setsockopt_rcv_timeout(sock,
+								app_socket_timeout * 1000);
+						(void) lttcomm_setsockopt_snd_timeout(sock,
+								app_socket_timeout * 1000);
+					}
 
 					/*
 					 * Set the CLOEXEC flag. Return code is useless because