From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 26 Mar 2010 17:53:31 +0000 (+0100)
Subject: Merge branch 'socket2' into new
X-Git-Tag: v1.2.2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb0f129fcedcecbee85403095abad8f59b82683c;p=thirdparty%2Fbird.git

Merge branch 'socket2' into new
---

eb0f129fcedcecbee85403095abad8f59b82683c
diff --cc sysdep/unix/io.c
index d86c8cb80,c7527c973..e9d78b61a
--- a/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)
  {