qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/posix/euidaccess.c [_LIBC] (euidaccess): Don't cache 

euid and egid.
This commit is contained in:
Ulrich Drepper 2005-11-27 17:14:28 +00:00
parent 9d55da2be7
commit fec53fc575
2 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-11-27 Ulrich Drepper <drepper@redhat.com> 2005-11-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/euidaccess.c [_LIBC] (euidaccess): Don't cache
euid and egid.
* nis/nis_table.c (nis_list): Add more free calls in error cases. * nis/nis_table.c (nis_list): Add more free calls in error cases.
2005-11-26 Richard Henderson <rth@redhat.com> 2005-11-26 Richard Henderson <rth@redhat.com>

88
sysdeps/posix/euidaccess.c
View File

@ -1,5 +1,5 @@
/* Check if effective user id can access file /* Check if effective user id can access file
Copyright (C) 1990,91,95,96,97,98,99,2000,01 Free Software Foundation, Inc. Copyright (C) 1990,1991,1995-2001,2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -21,26 +21,26 @@
Adapted for GNU C library by Roland McGrath. */ Adapted for GNU C library by Roland McGrath. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> # include <config.h>
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef S_IEXEC #ifdef S_IEXEC
#ifndef S_IXUSR # ifndef S_IXUSR
#define S_IXUSR S_IEXEC # define S_IXUSR S_IEXEC
#endif # endif
#ifndef S_IXGRP # ifndef S_IXGRP
#define S_IXGRP (S_IEXEC >> 3) # define S_IXGRP (S_IEXEC >> 3)
#endif # endif
#ifndef S_IXOTH # ifndef S_IXOTH
#define S_IXOTH (S_IEXEC >> 6) # define S_IXOTH (S_IEXEC >> 6)
#endif # endif
#endif /* S_IEXEC */ #endif /* S_IEXEC */
#if defined (HAVE_UNISTD_H) || defined (_LIBC) #if defined HAVE_UNISTD_H || defined _LIBC
#include <unistd.h> # include <unistd.h>
#endif #endif
#ifndef _POSIX_VERSION #ifndef _POSIX_VERSION
@ -55,35 +55,35 @@ gid_t getegid ();
extern int errno; extern int errno;
#endif #endif
#ifndef __set_errno #ifndef __set_errno
#define __set_errno(val) errno = (val) # define __set_errno(val) errno = (val)
#endif #endif
#if defined(EACCES) && !defined(EACCESS) #if defined EACCES && !defined EACCESS
#define EACCESS EACCES # define EACCESS EACCES
#endif #endif
#ifndef F_OK #ifndef F_OK
#define F_OK 0 # define F_OK 0
#define X_OK 1 # define X_OK 1
#define W_OK 2 # define W_OK 2
#define R_OK 4 # define R_OK 4
#endif #endif
#if !defined (S_IROTH) && defined (R_OK) #if !defined S_IROTH && defined R_OK
# define S_IROTH R_OK # define S_IROTH R_OK
#endif #endif
#if !defined (S_IWOTH) && defined (W_OK) #if !defined S_IWOTH && defined W_OK
# define S_IWOTH W_OK # define S_IWOTH W_OK
#endif #endif
#if !defined (S_IXOTH) && defined (X_OK) #if !defined S_IXOTH && defined X_OK
# define S_IXOTH X_OK # define S_IXOTH X_OK
#endif #endif
#ifdef _LIBC #ifdef _LIBC
#define group_member __group_member # define group_member __group_member
#define euidaccess __euidaccess # define euidaccess __euidaccess
#else #else
@ -93,14 +93,6 @@ static uid_t uid;
/* The user's real group id. */ /* The user's real group id. */
static gid_t gid; static gid_t gid;
#ifdef HAVE_GETGROUPS
int group_member ();
#else
#define group_member(gid) 0
#endif
#endif
/* The user's effective user id. */ /* The user's effective user id. */
static uid_t euid; static uid_t euid;
@ -110,6 +102,14 @@ static gid_t egid;
/* Nonzero if UID, GID, EUID, and EGID have valid values. */ /* Nonzero if UID, GID, EUID, and EGID have valid values. */
static int have_ids; static int have_ids;
# ifdef HAVE_GETGROUPS
int group_member ();
# else
# define group_member(gid) 0
# endif
#endif
/* Return 0 if the user has permission of type MODE on file PATH; /* Return 0 if the user has permission of type MODE on file PATH;
otherwise, return -1 and set `errno' to EACCESS. otherwise, return -1 and set `errno' to EACCESS.
@ -126,6 +126,9 @@ euidaccess (path, mode)
int granted; int granted;
#ifdef _LIBC #ifdef _LIBC
uid_t euid;
gid_t egid;
if (! __libc_enable_secure) if (! __libc_enable_secure)
/* If we are not set-uid or set-gid, access does the same. */ /* If we are not set-uid or set-gid, access does the same. */
return __access (path, mode); return __access (path, mode);
@ -157,12 +160,8 @@ euidaccess (path, mode)
#ifdef _LIBC #ifdef _LIBC
/* Now we need the IDs. */ /* Now we need the IDs. */
if (have_ids == 0) euid = __geteuid ();
{ egid = __getegid ();
have_ids = 1;
euid = __geteuid ();
egid = __getegid ();
}
#endif #endif
/* The super-user can read and write any file, and execute any file /* The super-user can read and write any file, and execute any file
@ -172,11 +171,12 @@ euidaccess (path, mode)
return 0; return 0;
if (euid == stats.st_uid) if (euid == stats.st_uid)
granted = (unsigned) (stats.st_mode & (mode << 6)) >> 6; granted = (unsigned int) (stats.st_mode & (mode << 6)) >> 6;
else if (egid == stats.st_gid || group_member (stats.st_gid)) else if (egid == stats.st_gid || group_member (stats.st_gid))
granted = (unsigned) (stats.st_mode & (mode << 3)) >> 3; granted = (unsigned int) (stats.st_mode & (mode << 3)) >> 3;
else else
granted = (stats.st_mode & mode); granted = (stats.st_mode & mode);
/* XXX Add support for ACLs. */
if (granted == mode) if (granted == mode)
return 0; return 0;
__set_errno (EACCESS); __set_errno (EACCESS);
@ -188,9 +188,9 @@ weak_alias (__euidaccess, euidaccess)
#endif #endif
#ifdef TEST #ifdef TEST
#include <stdio.h> # include <stdio.h>
#include <errno.h> # include <errno.h>
#include "error.h" # include "error.h"
char *program_name; char *program_name;