Fix regression introduced by previous IPC fds fix

[netatalk.git] / include / atalk / server_child.h

diff --git a/include/atalk/server_child.h b/include/atalk/server_child.h
index b45a3a42daf088c958618a69a6f350c4ff6653a4..5ee8314f3dd44c40992e788c7009a69ba20f782d 100644 (file)
--- a/include/atalk/server_child.h
+++ b/include/atalk/server_child.h
@@ -27,11 +27,12 @@ typedef struct server_child_data {
   pid_t     pid;               /* afpd worker process pid (from the worker afpd process )*/
   uid_t     uid;               /* user id of connected client (from the worker afpd process) */
   int       valid;             /* 1 if we have a clientid */
-  uint32_t  time;              /* client boot time (from the mac client) */
   int       killed;            /* 1 if we already tried to kill the client */
+  int       disasociated; /* 1 if this is not a child, but a child from a previous afpd master */
+  uint32_t  time;              /* client boot time (from the mac client) */
   uint32_t  idlen;             /* clientid len (from the Mac client) */
   char      *clientid;  /* clientid (from the Mac client) */
-  int       ipc_fds[2]; /* socketpair for IPC bw */
+  int       ipc_fd; /* socket for IPC bw afpd parent and childs */
   struct server_child_data **prevp, *next;
 } afp_child_t;
 
@@ -39,7 +40,7 @@ extern int parent_or_child;
 
 /* server_child.c */
 extern server_child *server_child_alloc (const int, const int);
-extern afp_child_t *server_child_add (server_child *, int, pid_t, uint ipc_fds[2]);
+extern afp_child_t *server_child_add (server_child *, int, pid_t, int ipc_fd);
 extern int  server_child_remove (server_child *, const int, const pid_t);
 extern void server_child_free (server_child *);