X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=a40948f27014813cc1fbbf26867da28e124ad07a;hp=00aab24b745e16eb95cfeead62d4a4a2cdd7e867;hb=2c679eeb8bbc93220f85403eca6e9380dc624a6a;hpb=4a262fc2d915538dd5ebaa58fa5ec7403de650cd

diff --git a/afs.c b/afs.c
index 00aab24b..a40948f2 100644
--- a/afs.c
+++ b/afs.c
@@ -174,8 +174,8 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	ret = init_unix_addr(&unix_addr, conf.afs_socket_arg);
 	if (ret < 0)
 		goto out;
-	ret = -E_CONNECT;
-	if (connect(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) < 0) /* FIXME: Use para_connect() */
+	ret = PARA_CONNECT(fd, &unix_addr);
+	if (ret < 0)
 		goto out;
 	ret = send_bin_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
@@ -795,6 +795,9 @@ __noreturn int afs_init(uint32_t cookie, int socket_fd)
 		exit(EXIT_FAILURE);
 	}
 	server_socket = socket_fd;
+	ret = mark_fd_nonblock(server_socket);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
 	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
 		server_socket, (unsigned) cookie);
 	current_play_mode = init_admissible_files();