Merge branch 'socket2' into new

diff --cc sysdep/unix/io.c
index d86c8cb8018bd0a70636a2af2ff9a528b3b21c9b,c7527c973442f0dd7ef883fefb0717e3221dfcbf..e9d78b61a546bd3866c2ca9c56cbe4d028be1ba3
--- 1/sysdep/unix/io.c
--- 2/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@@ -1098,13 -1165,17 +1163,15 @@@ sk_open_unix(sock *s, char *name
    if (listen(fd, 8))
      ERR("listen");
    sk_insert(s);
 -  return 0;
 +  return;
  
 -bad:
 + bad:
    log(L_ERR "sk_open_unix: %s: %m", err);
 -  close(fd);
 -  s->fd = -1;
 -  return -1;
 +  die("Unable to create control socket %s", name);
  }
  
+ static inline void reset_tx_buffer(sock *s) { s->ttx = s->tpos = s->tbuf; }
+ 
  static int
  sk_maybe_write(sock *s)
  {