Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv6548
Modified Files:
Tag: v1-0
ChangeLog asterisk.c
Log Message:
fix 'highpriority' for asterisk.conf (bug #3860)
Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.74.2.42
retrieving revision 1.74.2.43
diff -u -d -r1.74.2.42 -r1.74.2.43
--- ChangeLog 5 Apr 2005 09:31:11 -0000 1.74.2.42
+++ ChangeLog 5 Apr 2005 09:37:02 -0000 1.74.2.43
@@ -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
Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.125.2.5
retrieving revision 1.125.2.6
diff -u -d -r1.125.2.5 -r1.125.2.6
--- asterisk.c 15 Jan 2005 19:58:41 -0000 1.125.2.5
+++ asterisk.c 5 Apr 2005 09:37:02 -0000 1.125.2.6
@@ -1694,6 +1694,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);
@@ -1709,9 +1717,6 @@
ast_verbose("Running as group '%s'\n", rungroup);
}
- if (set_priority(option_highpriority)) {
- exit(1);
- }
if (runuser) {
struct passwd *pw;
pw = getpwnam(runuser);
@@ -1732,10 +1737,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();
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
