kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 08:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 191367 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r191367 | tilghman | 2009-04-30 12:40:58 -0500 (Thu, 30 Apr 2009) | 3 lines
  
  Detect eaccess (or euidaccess) before using it.
  Reported by Andrew Lindh via the -dev list.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@191369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-04-30 17:45:40 +00:00
parent 2c77a43e9b
commit a6d5af5386
4 changed files with 10763 additions and 11890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/asterisk.c
View File

@@ -3277,26 +3277,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());