diff options
Diffstat (limited to 'main/asterisk.c')
| -rw-r--r-- | main/asterisk.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 3de44a7fe..c2376b325 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3433,26 +3433,33 @@ int main(int argc, char *argv[]) if (geteuid() && ast_opt_dump_core) { if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) < 0) { ast_log(LOG_WARNING, "Unable to set the process for core dumps after changing to a non-root user. %s\n", strerror(errno)); - } + } } +#endif { +#if defined(HAVE_EACCESS) || defined(HAVE_EUIDACCESS) +#if defined(HAVE_EUIDACCESS) && !defined(HAVE_EACCESS) +#define eaccess euidaccess +#endif char dir[PATH_MAX]; if (!getcwd(dir, sizeof(dir)) || eaccess(dir, R_OK | X_OK | F_OK)) { ast_log(LOG_ERROR, "Unable to access the running directory (%s). Changing to '/' for compatibility.\n", strerror(errno)); /* If we cannot access the CWD, then we couldn't dump core anyway, * so chdir("/") won't break anything. */ if (chdir("/")) { - ast_log(LOG_ERROR, "chdir() failed?!! %s\n", strerror(errno)); + /* chdir(/) should never fail, so this ends up being a no-op */ + ast_log(LOG_ERROR, "chdir(\"/\") failed?!! %s\n", strerror(errno)); } - } else if (!ast_opt_no_fork && !ast_opt_dump_core) { + } else +#endif /* defined(HAVE_EACCESS) || defined(HAVE_EUIDACCESS) */ + if (!ast_opt_no_fork && !ast_opt_dump_core) { /* Backgrounding, but no cores, so chdir won't break anything. */ if (chdir("/")) { ast_log(LOG_ERROR, "Unable to chdir(\"/\") ?!! %s\n", strerror(errno)); } } } -#endif ast_term_init(); printf("%s", term_end()); |