[pacman-dev] [PATCH 2/4] Remove checks for geteuid

Eric Bélanger snowmaniscool at gmail.com
Sun Dec 16 18:21:57 EST 2012


On Sun, Dec 16, 2012 at 7:36 AM, Allan McRae <allan at archlinux.org> wrote:
> The geteuid function is defeined in POSIX and we will not support any
> operating systems without it.
>

typo: defeined -> defined

> Signed-off-by: Allan McRae <allan at archlinux.org>
> ---
>  configure.ac        | 2 +-
>  src/pacman/pacman.c | 4 ----
>  2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 122f387..8ec0eab 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -279,7 +279,7 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
>  AC_FUNC_MALLOC
>  AC_FUNC_MKTIME
>  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 \
>                  strchr strcspn strdup strerror strndup strrchr strsep strstr \
>                  strtol swprintf tcflush wcwidth uname])
> diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
> index e3293a0..e29cfc2 100644
> --- a/src/pacman/pacman.c
> +++ b/src/pacman/pacman.c
> @@ -758,9 +758,7 @@ int main(int argc, char *argv[])
>         size_t i;
>         struct sigaction new_action, old_action;
>         const int signals[] = { SIGHUP, SIGINT, SIGTERM, SIGSEGV };
> -#if defined(HAVE_GETEUID)
>         uid_t myuid = geteuid();
> -#endif
>
>         /* Set signal handlers */
>         /* Set up the structure to specify the new action. */
> @@ -880,13 +878,11 @@ int main(int argc, char *argv[])
>                 config->logmask &= ~ALPM_LOG_WARNING;
>         }
>
> -#if defined(HAVE_GETEUID)
>         /* check if we have sufficient permission for the requested operation */
>         if(myuid > 0 && needs_root()) {
>                 pm_printf(ALPM_LOG_ERROR, _("you cannot perform this operation unless you are root.\n"));
>                 cleanup(EXIT_FAILURE);
>         }
> -#endif
>
>         if(config->verbose > 0) {
>                 alpm_list_t *j;
> --
> 1.8.0.2
>
>


More information about the pacman-dev mailing list