1 files changed, 7 insertions, 1 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 761ca4c2..b1c96f37 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1856,7 +1856,7 @@ void
 vty_serv_un (char *path)
 {
   int ret;
-  int sock, len;
+  int sock, len, flags;
   struct sockaddr_un serv;
   mode_t old_mask;
   struct zprivs_ids_t ids;
@@ -1901,6 +1901,12 @@ vty_serv_un (char *path)
       return;
     }
 
+  /* set to non-blocking*/
+  if ( ((flags = fcntl (sock, F_GETFL)) == -1)
+      || (fcntl (sock, F_SETFL, flags|O_NONBLOCK) == -1) )
+    zlog_warn ("vty_serv_un: could not set vty socket to non-blocking,"
+               " %s", strerror (errno));
+
   umask (old_mask);
 
   zprivs_get_ids(&ids);