Merge 2-2

diff --cc NEWS
Simple merge

diff --cc libatalk/dsi/dsi_getsess.c
index 7c668ec8a62cd3e7c921ad9666d07d0661a37901,7a6109d15bac9c2e6c1fce0d9e6cc9b95986e4d8..8d6e544cdbc5d620d725abf70a158127b0ebf4b2
--- 1/libatalk/dsi/dsi_getsess.c
--- 2/libatalk/dsi/dsi_getsess.c
+++ b/libatalk/dsi/dsi_getsess.c
@@@ -80,8 -91,8 +81,9 @@@ afp_child_t *dsi_getsession(DSI *dsi, s
    }
  
    /* get rid of some stuff */
+   close(ipc_fds[0]);
    close(dsi->serversock);
 +  dsi->serversock = -1;
    server_child_free(serv_children); 
  
    switch (dsi->header.dsi_command) {

diff --cc libatalk/util/server_child.c
Simple merge