From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Sat, 24 Jan 2009 22:37:04 +0000 (+0100)
Subject: Build problem when no audiod.conf exists
X-Git-Tag: v0.3.4~73^2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=5dc2741ad46034876b058d82e0ecc2ff3cefa2c1

Build problem when no audiod.conf exists

This avoids stopping the build process and allows users to read
the detailed help before getting the error message about a missing
audiod.conf file - fixed by parsing after testing for the help text.
---

diff --git a/audiod.c b/audiod.c
index a92c4e3b..60d2612c 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1127,9 +1127,9 @@ int main(int argc, char *argv[])
 	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("audiod", conf);
 	drop_privileges_or_die(conf.user_arg, conf.group_arg);
-	parse_config_or_die();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
+	parse_config_or_die();
 	daemon_set_flag(DF_LOG_TIME);
 	daemon_set_flag(DF_LOG_HOSTNAME);
 	daemon_set_flag(DF_LOG_LL);