X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=397ef9a257ed89743ca651eed797890966d59a2a;hb=61b0a431ca3c5dabfa5445355664f00e312c5299;hp=35c835ecc143fa6c2d73a1c16687f0ed8a8b8f00;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 35c835ec..397ef9a2 100644
--- a/audiod.c
+++ b/audiod.c
@@ -866,14 +866,14 @@ static int audiod_get_socket(void)
 	PARA_NOTICE_LOG("local socket: %s\n", socket_name);
 	if (conf.force_given)
 		unlink(socket_name);
-	fd = create_pf_socket(socket_name, &unix_addr,
+	fd = create_local_socket(socket_name, &unix_addr,
 			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
 	if (fd < 0) {
-		PARA_EMERG_LOG("%s", "can not connect to socket\n");
+		PARA_EMERG_LOG("can not connect to socket\n");
 		exit(EXIT_FAILURE); /* do not unlink socket */
 	}
 	if (listen(fd , 5) < 0) {
-		PARA_EMERG_LOG("%s", "can not listen on socket\n");
+		PARA_EMERG_LOG("can not listen on socket\n");
 		exit(EXIT_FAILURE); /* do not unlink socket */
 	}
 	mark_fd_nonblock(fd);
@@ -1132,7 +1132,14 @@ int main(int argc, char *argv[])
 	para_drop_privileges(conf.user_arg, conf.group_arg);
 	cf = configfile_exists();
 	if (cf) {
-		if (audiod_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
+		struct audiod_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+
+		};
+		if (audiod_cmdline_parser_config_file(cf, &conf, &params)) {
 			PARA_EMERG_LOG("%s", "parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}