X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=server.c;h=7fccea77482640f45dcef3a8c7809e54924554ca;hb=35d6655e0f4c1b1040d0546b33cd5aabf37e08bb;hp=febfe2ad02ca2828c1dffe65d2243ed8b661e605;hpb=19b62f8310b84db99dd95fda8218823abdb3d7bf;p=paraslash.git

diff --git a/server.c b/server.c
index febfe2ad..7fccea77 100644
--- a/server.c
+++ b/server.c
@@ -199,7 +199,6 @@ static void shm_init(void)
 	mmd->events = 0;
 	mmd->num_connects = 0;
 	mmd->active_connections = 0;
-	strcpy(mmd->afd.path, "(none)");
 	mmd->vss_status_flags = VSS_NEXT;
 	mmd->new_vss_status_flags = VSS_NEXT;
 	mmd->sender_cmd_data.cmd_num = -1;
@@ -304,12 +303,12 @@ static void setup_signal_handling(void)
 
 static unsigned init_network(void)
 {
-	int fd, ret = init_tcp_socket(conf.port_arg);
+	int fd, ret = tcp_listen(conf.port_arg);
 
 	if (ret < 0)
 		goto err;
 	fd = ret;
-	ret = mark_fd_nonblock(fd);
+	ret = mark_fd_nonblocking(fd);
 	if (ret < 0)
 		goto err;
 	add_close_on_fork_list(fd); /* child doesn't need the listener */
@@ -364,7 +363,7 @@ static void init_afs(void)
 	}
 	close(afs_server_socket[1]);
 	afs_socket = afs_server_socket[0];
-	ret = mark_fd_nonblock(afs_socket);
+	ret = mark_fd_nonblocking(afs_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	add_close_on_fork_list(afs_socket);