diff --git a/lib/ChangeLog b/lib/ChangeLog
index 28c0c00..292f850 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-31 Paul Jakma <paul@dishone.st>
+
+	* vty.c: As per Andrew's suggestions..
+	  (vty_serv_un) remove flags.
+	  (vtysh_accept) close socket if we cant set NONBLOCK. Add flags.
+
 2004-10-29 Paul Jakma <paul@dishone.st>
 
 	* vty.c: Move setting of sock to O_NONBLOCK from vty_serv_un
diff --git a/lib/vty.c b/lib/vty.c
index 7db1aa9..e37c99f 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1857,7 +1857,7 @@
 vty_serv_un (const char *path)
 {
   int ret;
-  int sock, len, flags;
+  int sock, len;
   struct sockaddr_un serv;
   mode_t old_mask;
   struct zprivs_ids_t ids;
@@ -1927,6 +1927,7 @@
   int accept_sock;
   int sock;
   int client_len;
+  int flags;
   struct sockaddr_un client;
   struct vty *vty;
   
@@ -1949,8 +1950,12 @@
   /* 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));
+    {
+      zlog_warn ("vtysh_accept: could not set vty socket to non-blocking,"
+                 " %s, closing", strerror (errno));
+      close (sock);
+      return -1;
+    }
   
 #ifdef VTYSH_DEBUG
   printf ("VTY shell accept\n");