aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-08 02:19:53 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2005-11-08 02:19:53 +0000
commit251ece64d113b1cebe835d9c07442a617cd81c81 (patch)
tree95d67201ef6425390f6429a46d3a54da0731fa78
parent7ac940b7fdaef6cdc9762b07e371322906fdaa87 (diff)
issue #5581
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7014 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xChangeLog2
-rwxr-xr-xasterisk.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 39f4f5325..220a314da 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-11-07 Kevin P. Fleming <kpfleming@digium.com>
+ * asterisk.c (main): setpriority() failure is not a reason to stop the process (issue #5581)
+
* say.c (ast_say_date_with_format_da): say hours properly (issue #5576)
* manager.c (astman_get_variables): restore old multiple-variable behavior for "Variable" header (issue #5585)
diff --git a/asterisk.c b/asterisk.c
index 201c9fd6b..0208cc1ac 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -2061,9 +2061,8 @@ int main(int argc, char *argv[])
runuser = ast_config_AST_RUN_USER;
#ifndef __CYGWIN__
- if (!is_child_of_nonroot && ast_set_priority(option_highpriority)) {
- exit(1);
- }
+ if (!is_child_of_nonroot)
+ ast_set_priority(option_highpriority);
if (!is_child_of_nonroot && rungroup) {
struct group *gr;