kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix order of priority reading / file reading (bug #3860)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-03-26 07:16:18 +00:00
parent 2bc067a740
commit c72d7a5c2c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
asterisk.c
View File

@@ -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) { if (rungroup) {
struct group *gr; struct group *gr;
gr = getgrnam(rungroup); gr = getgrnam(rungroup);
@@ -1802,9 +1810,6 @@ int main(int argc, char *argv[])
ast_verbose("Running as group '%s'\n", rungroup); ast_verbose("Running as group '%s'\n", rungroup);
} }
if (set_priority(option_highpriority)) {
exit(1);
}
if (runuser) { if (runuser) {
struct passwd *pw; struct passwd *pw;
pw = getpwnam(runuser); pw = getpwnam(runuser);
@@ -1824,10 +1829,6 @@ int main(int argc, char *argv[])
printf(term_end()); printf(term_end());
fflush(stdout); fflush(stdout);
if (option_console && !option_verbose)
ast_verbose("[ Reading Master Configuration ]");
ast_readconfig();
if (option_console && !option_verbose) if (option_console && !option_verbose)
ast_verbose("[ Initializing Custom Configuration Options ]"); ast_verbose("[ Initializing Custom Configuration Options ]");
/* custom config setup */ /* custom config setup */