From dccfb1902c5ed8126a304b9ca12830a378933d1f Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 29 Oct 2004 08:29:36 +0000 Subject: 2004-10-29 Paul Jakma * vty.c: Move setting of sock to O_NONBLOCK from vty_serv_un to vtysh_accept, where sock is the actual fd we wanted to set to O_NONBLOCK, ie the /connected/ vtysh unix socket. --- lib/vty.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/vty.c') diff --git a/lib/vty.c b/lib/vty.c index d21f38c9..7db1aa91 100644 --- a/lib/vty.c +++ b/lib/vty.c @@ -1902,12 +1902,6 @@ vty_serv_un (const 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); @@ -1952,6 +1946,12 @@ vtysh_accept (struct thread *thread) return -1; } + /* 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)); + #ifdef VTYSH_DEBUG printf ("VTY shell accept\n"); #endif /* VTYSH_DEBUG */ -- cgit v1.2.3