Merge commit 'fml/master'

diff --combined audiod.c
index dab3e3dad7dfffa3ee5733355489b04f1762a6fa,ffd2382e9580996a2dd15c43fbbe460a0ea177ca..6477c5474b60d83d557bce7239a5ac31451491de
--- 1/audiod.c
--- 2/audiod.c
+++ b/audiod.c
@@@ -1021,13 -1021,13 +1021,13 @@@ static void status_pre_select(struct sc
                int argc = 3;
                PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
                st->clock_diff_count--;
 -              client_open(argc, argv, &st->ct);
 +              client_open(argc, argv, &st->ct, NULL);
                set_stat_task_restart_barrier(2);
  
        } else {
                char *argv[] = {"audiod", "stat", NULL};
                int argc = 2;
 -              client_open(argc, argv, &st->ct);
 +              client_open(argc, argv, &st->ct, NULL);
                set_stat_task_restart_barrier(5);
        }
        free(stat_item_values[SI_BASENAME]);
@@@ -1126,10 -1126,10 +1126,10 @@@ int main(int argc, char *argv[]
        valid_fd_012();
        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();
+       drop_privileges_or_die(conf.user_arg, conf.group_arg);
+       parse_config_or_die();
        daemon_set_flag(DF_LOG_TIME);
        daemon_set_flag(DF_LOG_HOSTNAME);
        daemon_set_flag(DF_LOG_LL);