#
#
# patch "src/administrator.cc"
#  from [79ca54c69501d3a75565e1b0a3feb45415fa9931]
#    to [dbdeeea9509a0dc87349d77d75b168e9d946f185]
# 
# patch "src/sock.cc"
#  from [d7f4f0f1dcbbe4c93ae84466a95b3a42aa240604]
#    to [4168bdc9aa2604bb125c62222345a67005f2f42f]
# 
# patch "src/usher.cc"
#  from [fe56085ef14edeaf5c0e62784769b58b02201032]
#    to [c35156c1e5bd129e2d920df6ccc24a14b94a2376]
#
============================================================
--- src/administrator.cc	79ca54c69501d3a75565e1b0a3feb45415fa9931
+++ src/administrator.cc	dbdeeea9509a0dc87349d77d75b168e9d946f185
@@ -273,8 +273,8 @@ administrator::process_selected(fd_set &
       struct sockaddr_in addr;
       unsigned int l = sizeof(addr);
       memset(&addr, 0, l);
-      sock nc = tosserr(accept(port, (struct sockaddr *)
-                                    &addr, &l), "accept()");
+      sock nc = tosserr(accept4(port, (struct sockaddr *)
+                                    &addr, &l, SOCK_NONBLOCK), "accept()");
       conns.push_back(make_pair(cstate(), nc));
     } catch(errstr & s) {
       cerr<<"During new admin connection: "<<s.name<<"\n";
============================================================
--- src/sock.cc	d7f4f0f1dcbbe4c93ae84466a95b3a42aa240604
+++ src/sock.cc	4168bdc9aa2604bb125c62222345a67005f2f42f
@@ -143,7 +143,7 @@ start(string const & addr, int port)
 sock
 start(string const & addr, int port)
 {
-  sock s = tosserr(socket(AF_INET, SOCK_STREAM, 0), "socket()");
+  sock s = tosserr(socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0), "socket()");
   int yes = 1;
   tosserr(setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
       &yes, sizeof(yes)), "setsockopt");
============================================================
--- src/usher.cc	fe56085ef14edeaf5c0e62784769b58b02201032
+++ src/usher.cc	c35156c1e5bd129e2d920df6ccc24a14b94a2376
@@ -174,8 +174,8 @@ int main (int argc, char **argv)
         struct sockaddr_in client_address;
         unsigned int l = sizeof(client_address);
         memset(&client_address, 0, l);
-        sock cli = tosserr(accept(admin.serverport, (struct sockaddr *)
-                                     &client_address, &l), "accept()");
+        sock cli = tosserr(accept4(admin.serverport, (struct sockaddr *)
+                                     &client_address, &l, SOCK_NONBLOCK), "accept()");
         if (manager.get_connections_allowed())
           newchan = new channel(cli, manager);
         else {