X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=d98e9603ced15a27ea1780ffb7ef850e5138c55e;hp=94e6564b783371fb8cd77e9f8c0a96eb55093f6f;hb=9be19e7946fd413df61eca5e9a934834c5757494;hpb=cb6d1dfb9e4067229a4bbde0abd05784d97ef14b

diff --git a/server.c b/server.c
index 94e6564b..d98e9603 100644
--- a/server.c
+++ b/server.c
@@ -15,6 +15,8 @@
  *
  */
 
+#include <sys/types.h>
+#include <dirent.h>
 
 #include "para.h"
 #include "server.cmdline.h"
@@ -31,6 +33,8 @@
 #include "string.h"
 #include "ipc.h"
 #include "fd.h"
+#include "list.h"
+#include "sched.h"
 #include "signal.h"
 #include "user_list.h"
 #include "afs.h"
@@ -346,7 +350,7 @@ out:
 	exit(EXIT_FAILURE);
 }
 
-static uint32_t afs_socket_cookie;
+uint32_t afs_socket_cookie;
 static int afs_socket;
 pid_t afs_pid;
 
@@ -361,10 +365,16 @@ static void init_afs(void)
 	afs_pid = fork();
 	if (afs_pid < 0)
 		exit(EXIT_FAILURE);
-	if (!afs_pid) /* child (afs) */
+	if (!afs_pid) { /* child (afs) */
+		close(afs_server_socket[0]);
 		afs_init(afs_socket_cookie, afs_server_socket[1]);
+	}
 	close(afs_server_socket[1]);
 	afs_socket = afs_server_socket[0];
+	ret = mark_fd_nonblock(afs_socket);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
+	add_close_on_fork_list(afs_socket);
 	PARA_INFO_LOG("afs_socket: %d, afs_socket_cookie: %u\n", afs_socket,
 		(unsigned) afs_socket_cookie);
 }