X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=a1f1d62169d7a24a3be814a284df87c56032f3a9;hp=85aa517ac536ae6796c84f5605556364af299234;hb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3;hpb=4d6ce5632164bfcbdca74dd3d1bb0c1e35917938

diff --git a/audiod.c b/audiod.c
index 85aa517a..a1f1d621 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file audiod.c the paraslash's audio daemon */
@@ -878,7 +866,7 @@ 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");
@@ -1144,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);
 		}