X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=1b53f705423556040736a4e70dbd8fc7460a38f2;hp=bf8a1a40aa1556001d9d52f0c33993f37db9a143;hb=cd4b294da6f6802d9918c8fe5bcecb8a2a2363c3;hpb=974c42fd818babdfd2590df59b2a74a80398e826

diff --git a/client_common.c b/client_common.c
index bf8a1a40..1b53f705 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1997-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 client_common.c common functions of para_client and para_audiod */
@@ -81,6 +69,7 @@ void client_close(struct private_client_data *pcd)
 	free(pcd->user);
 	free(pcd->config_file);
 	free(pcd->key_file);
+	client_cmdline_parser_free(&pcd->conf);
 	free(pcd);
 }
 
@@ -164,9 +153,16 @@ int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
 		ret = -E_NO_CONFIG;
 		goto out;
 	}
-	if (!ret)
-		client_cmdline_parser_configfile(pcd->config_file,
-			&pcd->conf, 0, 0, 0);
+	if (!ret) {
+		struct client_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		client_cmdline_parser_config_file(pcd->config_file,
+			&pcd->conf, &params);
+	}
 	ret = 1;
 	PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg);
 	PARA_INFO_LOG("config_file: %s\n", pcd->config_file);