mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-18 10:51:40 +00:00
Fix order of priority reading / file reading (bug #3860)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
15
asterisk.c
15
asterisk.c
@@ -1787,6 +1787,14 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
}
|
||||
|
||||
if (option_console && !option_verbose)
|
||||
ast_verbose("[ Reading Master Configuration ]");
|
||||
ast_readconfig();
|
||||
|
||||
if (set_priority(option_highpriority)) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (rungroup) {
|
||||
struct group *gr;
|
||||
gr = getgrnam(rungroup);
|
||||
@@ -1802,9 +1810,6 @@ int main(int argc, char *argv[])
|
||||
ast_verbose("Running as group '%s'\n", rungroup);
|
||||
}
|
||||
|
||||
if (set_priority(option_highpriority)) {
|
||||
exit(1);
|
||||
}
|
||||
if (runuser) {
|
||||
struct passwd *pw;
|
||||
pw = getpwnam(runuser);
|
||||
@@ -1824,10 +1829,6 @@ int main(int argc, char *argv[])
|
||||
printf(term_end());
|
||||
fflush(stdout);
|
||||
|
||||
if (option_console && !option_verbose)
|
||||
ast_verbose("[ Reading Master Configuration ]");
|
||||
ast_readconfig();
|
||||
|
||||
if (option_console && !option_verbose)
|
||||
ast_verbose("[ Initializing Custom Configuration Options ]");
|
||||
/* custom config setup */
|
||||
|
Reference in New Issue
Block a user