Detect eaccess (or euidaccess) before using it.

Reported by Andrew Lindh via the -dev list.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@191367 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index dbbb19e35df8dbd3181ed7783e9a3084d7675f03..8291d8218ca14ab0d2741f5b2abdd1670bdbd90a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 190150 .
+# From configure.ac Revision: 190093 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -15954,7 +15954,9 @@ done
 
 
 
-for ac_func in asprintf atexit closefrom dup2 endpwent ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
+
+
+for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/configure.ac b/configure.ac
index 211df5e7b46c3d3376a1dc2a70b4d447f92ae260..8b8d7c0eafc5656b39923b46cd2e9d62299b2fe4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -351,7 +351,7 @@ AC_FUNC_STRNLEN
 AC_FUNC_STRTOD
 AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([asprintf atexit closefrom dup2 endpwent ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf getpeereid sysctl swapctl])
+AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday ioperm inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtol strtoq unsetenv utime vasprintf getpeereid sysctl swapctl])
 
 AC_CHECK_FUNCS([glob])
 

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 57987139f54d1cf016b8e33eccdc0abacfb4b29e..8fe5c8c31d66e6d130fe181785bf55086c1aba39 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -220,9 +220,15 @@
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
+/* Define to 1 if you have the `eaccess' function. */
+#undef HAVE_EACCESS
+
 /* Define to 1 if you have the `endpwent' function. */
 #undef HAVE_ENDPWENT
 
+/* Define to 1 if you have the `euidaccess' function. */
+#undef HAVE_EUIDACCESS
+
 /* Define this to indicate the ${EXP_DESCRIP} library */
 #undef HAVE_EXP
 

diff --git a/main/asterisk.c b/main/asterisk.c
index 3de44a7fecd2212aa75311b7901534c1c207e339..c2376b3254a4f85d21866274868bcd0e27a8bfa4 100644 (file)
--- 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());