[Asterisk-cvs] asterisk asterisk.c,1.143,1.144

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv8405

Modified Files:
	asterisk.c 
Log Message:
Fix order of priority reading / file reading (bug #3860)


Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- asterisk.c	11 Mar 2005 07:24:10 -0000	1.143
+++ asterisk.c	26 Mar 2005 07:16:18 -0000	1.144
@@ -1787,6 +1787,14 @@
 		}
 	}
 
+	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 @@
 			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 @@
 	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();