aboutsummaryrefslogtreecommitdiffstats
path: root/asterisk.c
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-03-26 07:16:18 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-03-26 07:16:18 +0000
commit4b5e08227a6c8e3ff8b817c0db206f35ee3eb1ec (patch)
tree31163cc78f56838a708f6456e5fb028ba5c0c4de /asterisk.c
parent27989646244a77d19b4f67a679912239ea49d67b (diff)
Fix order of priority reading / file reading (bug #3860)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5266 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rwxr-xr-xasterisk.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/asterisk.c b/asterisk.c
index cb31376cf..8c62dcac5 100755
--- a/asterisk.c
+++ b/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);
@@ -1825,10 +1830,6 @@ int main(int argc, char *argv[])
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 */
register_config_cli();