X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=c5e2c93ee51363a69f3178b77c4d79982b427f73;hp=96621e4b62aa52b575f8881e1f5ba826f44259d7;hb=218a175db8e7a43cad9073770ebdb24a7bdc64e8;hpb=720908589d8c03c96c33f3033c0817c599a7c8b0

diff --git a/afs.c b/afs.c
index 96621e4b..c5e2c93e 100644
--- a/afs.c
+++ b/afs.c
@@ -637,25 +637,19 @@ static int setup_command_socket_or_die(void)
 {
 	int ret, socket_fd;
 	char *socket_name = conf.afs_socket_arg;
-	struct sockaddr_un unix_addr;
 
 	unlink(socket_name);
-	ret = create_local_socket(socket_name, &unix_addr,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+	ret = create_local_socket(socket_name, 0);
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
-		exit(EXIT_FAILURE);
+		ret = create_local_socket(socket_name,
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
+				socket_name);
+			exit(EXIT_FAILURE);
+		}
 	}
 	socket_fd = ret;
-	if (listen(socket_fd , 5) < 0) {
-		PARA_EMERG_LOG("can not listen on socket\n");
-		exit(EXIT_FAILURE);
-	}
-	ret = mark_fd_nonblocking(socket_fd);
-	if (ret < 0) {
-		close(socket_fd);
-		return ret;
-	}
 	PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name,
 		socket_fd);
 	return socket_fd;