From 8451fd7f7d008045105c28d68762bf2709cb1317 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 5 Apr 2005 09:37:02 +0000 Subject: [PATCH] fix 'highpriority' for asterisk.conf (bug #3860) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5402 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- CHANGES | 4 +++- asterisk.c | 15 ++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index f28020cb2d..94c71689e2 100755 --- a/CHANGES +++ b/CHANGES @@ -23,6 +23,8 @@ call is executing an AGI script calling the GET DATA command. -- app_disa -- Fixed the timeout used when no password is set + -- rtp + -- Fixed a logic error when setting the "rtpchecksums" option -- general -- A problem has been fixed with saying the date in Spanish. -- A line was missing for the autosupport script that caused "make rpm" to fail @@ -31,9 +33,9 @@ -- Fixed if the last line of text in a file for the call spool did not contain a new line, it would not be processed -- Fixed the logger so that color escape sequences wouldn't be sent to the logs - -- Fixed a logic error when setting the "rtpchecksums" option -- A lot of changes were made to correctly handle signed linear format on big endian machines + -- fix 'highpriority' option for asterisk.conf Asterisk 1.0.7 diff --git a/asterisk.c b/asterisk.c index 113e5a1725..1bf800d4c8 100755 --- a/asterisk.c +++ b/asterisk.c @@ -1694,6 +1694,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); @@ -1709,9 +1717,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); @@ -1731,10 +1736,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 */ -- 2.47.2