moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove checks for geteuid 

The geteuid function is defined in POSIX and we will not support any
operating systems without it.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-12-16 22:05:49 +10:00
parent 5aaf5bcf83
commit d5a6ce8ca1
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -279,7 +279,7 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
AC_FUNC_MALLOC AC_FUNC_MALLOC
AC_FUNC_MKTIME AC_FUNC_MKTIME
AC_FUNC_STRCOLL AC_FUNC_STRCOLL
AC_CHECK_FUNCS([dup2 getcwd geteuid getmntinfo gettimeofday memmove memset \ AC_CHECK_FUNCS([dup2 getcwd getmntinfo gettimeofday memmove memset \
mkdir realpath regcomp rmdir setenv setlocale strcasecmp \ mkdir realpath regcomp rmdir setenv setlocale strcasecmp \
strchr strcspn strdup strerror strndup strrchr strsep strstr \ strchr strcspn strdup strerror strndup strrchr strsep strstr \
strtol swprintf tcflush wcwidth uname]) strtol swprintf tcflush wcwidth uname])

4
src/pacman/pacman.c
View File

@ -758,9 +758,7 @@ int main(int argc, char *argv[])
size_t i; size_t i;
struct sigaction new_action, old_action; struct sigaction new_action, old_action;
const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV }; const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV };
#if defined(HAVE_GETEUID)
uid_t myuid = geteuid(); uid_t myuid = geteuid();
#endif
/* Set signal handlers */ /* Set signal handlers */
/* Set up the structure to specify the new action. */ /* Set up the structure to specify the new action. */
@ -880,13 +878,11 @@ int main(int argc, char *argv[])
config->logmask &= ~ALPM_LOG_WARNING; config->logmask &= ~ALPM_LOG_WARNING;
} }
#if defined(HAVE_GETEUID)
/* check if we have sufficient permission for the requested operation */ /* check if we have sufficient permission for the requested operation */
if(myuid > 0 && needs_root()) { if(myuid > 0 && needs_root()) {
pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n")); pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n"));
cleanup(EXIT_FAILURE); cleanup(EXIT_FAILURE);
} }
#endif
if(config->verbose > 0) { if(config->verbose > 0) {
alpm_list_t *j; alpm_list_t *j;