mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-27 04:41:02 +08:00
c4563d2d66
1999-04-28 Ulrich Drepper <drepper@cygnus.com> * argp/argp-ba.c (argp_program_bug_address): Don't initialize with 0. * argp/argp-parse.c (_argp_hang): Likewise. * argp/argp-pv.c (argp_program_version): Likewise. * argp/argp-pvh.c (argp_program_version_hook): Likewise. * inet/ether_hton.c (ether_hton, startp): Likewise. * inet/ether_ntoh.c (ether_ntoh, startp): Likewise. * inet/getnetgrent_r.c (setup, startp): Likewise. * intl/loadmsgcat.c (_nl_msg_cat_cntr): Likewise. * intl/localealias.c (string_space, string_space_act, string_space_max, nmap, maxmap): Likewise. * libio/iopopen.c (proc_file_chain): Likewise. * libio/oldiopopen.c (old_proc_file_chain): Likewise. * locale/lc-collate.c (__collate_table, __collate_extra, __collate_element_hash, __collate_element_strings, __collate_element_values): Likewise. * malloc/mcheck.c (mcheck_used): Likewise. * malloc/mtrace.c (added_atexit_handler): Likewise. * malloc/set-freeres.c (already_called): Likewise. * misc/getpass.c (getpass) [buf, bufsize]: Likewise. * misc/syslog.c (LogStat, LogTag): Likewise. * nss/XXX-lookup.c (DATABASE_NAME_SYMBOL): Likewise. * nss/getXXbyYY_r.c (startp): Likewise. * posix/getopt.c (optarg, __getopt_initialized): Likewise. * posix/regex.c (init_syntax_once) [done]: Likewise. (debug): Likewise. * string/strfry.c (init): Likewise. * sunrpc/svc_run.c (svc_top): Likewise. * posix/euidaccess.c (have_ids): Likewise. * sysdeps/unix/sysv/linux/poll.c (must_emulate): Likewise. * sysdeps/unix/sysv/linux/ttyname.c (__ttyname, namelen): Likewise. * time/getdate.c (getdate_err): Likewise. * time/tzfile.c (transitions, type_idxs, types, zone_names, leaps): Likewise. * time/tzset.c (old_tz, is_initialized): Likewise. * inet/getnameinfo.c (nrl_domainname): Rewrite to allow initialization of static data with zero. * signal/allocrtsig.c (init): Likewise. * string/Makefile (routines): Add strchrnul. * string/Versions [GLIBC_2.1.1]: Add strchrnul. * string/string.c: Add strchrnul prototype. * include/string.h: Add __strchrnul prototype. * sysdeps/generic/strchrnul.c: New file. * sysdeps/i386/strchrnul.S: New file. * sysdeps/i386/bits/string.c: Add strchrnul optimization. * sysdeps/i386/i486/bits/string.c: Likewise. * argp/argp-help.c (argp_args_usage): Use __strchrnul. * inet/ether_line.c (ether_line): Likewise. * nscd/nscd_conf.c (nscd_parse_file): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * posix/execvp.c (execvp): Likewise. * posix/fnmatch.c (internal_fnmatch): Likewise. * resolv/res_hconf.c (_res_hconv_init): Likewise. * resolv/res_init.c (res_init): Likewise. * stdlib/fmtmsg.c (init): Likewise. * stdlib/getsubopt.c (getsubopt): Likewise. * catgets/catgets.c (catopen): Only allocate one memory block. (catclose): Only one free call necessary. * catgets/open_catalog.c (__open_catalog): Simplify handling of file descriptor. * ctype/ctype-extn.c: Make __toascii_l and __isascii_l alias instead of real functions. Simplify _tolower and _toupper. * grp/initgroups.c (compat_call): Remove unnecessary use of pointer variable. * iconv/gconv.h (struct gconv_info): Change data element from pointer to array of size 0. * iconv/gconv_open.c (__gconv_open): Allocate structures accordingly. * iconv/gconv_close.c (__gconv_close): Don't free data. * iconv/gconv_conf.c (add_alias): Avoid searching in tree twice to insert new alias. * iconv/gconv_db.c (add_derivation): More efficient copying. Check for error while inserting in tree. * include/time.h: Pretty print. * inet/ruserpass.c: Rewrite use of toktab to avoid string pointers in table and lots of relocations. * posix/regex.c (regerror): Rewrite use of re_error_msgid to avoid string pointers in table and lots of relocations. * intl/finddomain.c: Remove definition of strchr macro. * io/ftw.c (nftw_arr, ftw_arr): Make const. * locale/loadlocale.c (_nl_load_locale): Optimize string copying. * locale/localeinfo.h (_nl_category_names): Change into an array with fixed width char string elements. * locale/setlocale.c (_nl_category_names): Likewise. (_nl_current): Make global. * locale/nl_langinfo.c (nldata): Removed. Use _nl_current now. * malloc/Makefile (distribute): Add stackinfo.h. * sysdeps/generic/stackinfo.h: New file. * sysdeps/i386/stackinfo.h: New file. * posix/execl.c: Use stackinfo.h in optimizing alloca use. * posix/execle.c: Likewise. * posix/execlp.c: Likewise. * nis/nis_table.c (__create_ib_request): Always use realloc. * posix/execvp.c (execute): Rename to script_execute and keep only code to execute using shell. (execvp): Call execv directly and only fall back on script_execute. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Remove digits define and always use xdigits instead. * resolv/res_init.c (res_init): Use rawmemchr instead of strchr where appropriate. * stdlib/fpioconst.h (__tens): New declaration. (struct mp_power): Remove array, add arrayoff element. * stdlib/fpioconst.c: Replace definitions of _ten_p* arrays by one __tens array and add in _fpioconst_pow10 offsets into __tens. * stdio-common/printf_fp.c: Rewrite to use new __tens array. * stdlib/strtod.c: Likewise. * stdlib/a64l.c (a64l_table): Avoid unnecessary elements. * stdlib/exit.c: Rewrite to use __exit_funcs being as sign for end of the list. * stdlib/atexit.c (__exit_funcs): Don't initialize. * stdlib/fmtmsg.c (keywords): Make name element fixed width array. * sunrpc/clnt_perr.c: Rewrite clnt_sperrno and auth_errmsg to use a single and an array with offsets. * sunrpc/des_soft.c (partab): Make it const. * sunrpc/key_call.c (trytimeout, tottimeout): Make const. (__key_encryptsession_pk_LOCAL): Don't initialize with 0. (__key_decryptsession_pk_LOCAL): Likewise. (__key_gendes_LOCAL): Likewise. (MESSENGER): Mark const. (key_call_private_main): Don't initialize with 0. (use_keyenvoy): Don't initialize with 0. (key_call): Rewrite to reverse logic of use_doors variable. * sunrpc/netname.c (OPSYS): Define as array, not pointer. (startp): Don't initialize with zero. * sunrpc/openchild.c (_openchild): Make first argument const. * sunrpc/pmap_rmt.c (timeout): Mark const. * sunrpc/xcrypt.c (hex): Likewise. * sysdeps/unix/sysv/linux/getcwd.c: Rewrite to allow omitting initialization of global variables. * sysdeps/unix/sysv/linux/getpt.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Likewise. * termios/tcgetsid.c: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h (x86_cap_flags): Change fxsr to osfxsr. * time/tzfile.c (__tzfile_read): Rewrite to allocate only one memory block. Add function to free memory if wanted. * time/tzset.c (tzset_internal): Pass extra argument to __tzfile_read. * wcsmbs/wcsmbsload.c (to_wc, to_mb): Correct initializers. * wcsmbs/wmemset.c: Little code optimization.
230 lines
5.0 KiB
C
230 lines
5.0 KiB
C
/* Check if effective user id can access file
|
||
Copyright (C) 1990, 91, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
|
||
The GNU C Library is free software; you can redistribute it and/or
|
||
modify it under the terms of the GNU Library General Public License as
|
||
published by the Free Software Foundation; either version 2 of the
|
||
License, or (at your option) any later version.
|
||
|
||
The GNU C Library is distributed in the hope that it will be useful,
|
||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Library General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Library General Public
|
||
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
Boston, MA 02111-1307, USA. */
|
||
|
||
/* Written by David MacKenzie and Torbjorn Granlund.
|
||
Adapted for GNU C library by Roland McGrath. */
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <sys/types.h>
|
||
#include <sys/stat.h>
|
||
|
||
#ifdef S_IEXEC
|
||
#ifndef S_IXUSR
|
||
#define S_IXUSR S_IEXEC
|
||
#endif
|
||
#ifndef S_IXGRP
|
||
#define S_IXGRP (S_IEXEC >> 3)
|
||
#endif
|
||
#ifndef S_IXOTH
|
||
#define S_IXOTH (S_IEXEC >> 6)
|
||
#endif
|
||
#endif /* S_IEXEC */
|
||
|
||
#if defined (HAVE_UNISTD_H) || defined (_LIBC)
|
||
#include <unistd.h>
|
||
#endif
|
||
|
||
#ifdef _POSIX_VERSION
|
||
#include <limits.h>
|
||
#if !defined(NGROUPS_MAX) || NGROUPS_MAX < 1
|
||
#undef NGROUPS_MAX
|
||
#define NGROUPS_MAX sysconf (_SC_NGROUPS_MAX)
|
||
#endif /* NGROUPS_MAX */
|
||
|
||
#else /* not _POSIX_VERSION */
|
||
uid_t getuid ();
|
||
gid_t getgid ();
|
||
uid_t geteuid ();
|
||
gid_t getegid ();
|
||
#include <sys/param.h>
|
||
#if !defined(NGROUPS_MAX) && defined(NGROUPS)
|
||
#define NGROUPS_MAX NGROUPS
|
||
#endif /* not NGROUPS_MAX and NGROUPS */
|
||
#endif /* not POSIX_VERSION */
|
||
|
||
#include <errno.h>
|
||
#ifndef errno
|
||
extern int errno;
|
||
#endif
|
||
#ifndef __set_errno
|
||
#define __set_errno(val) errno = (val)
|
||
#endif
|
||
|
||
#if defined(EACCES) && !defined(EACCESS)
|
||
#define EACCESS EACCES
|
||
#endif
|
||
|
||
#ifndef F_OK
|
||
#define F_OK 0
|
||
#define X_OK 1
|
||
#define W_OK 2
|
||
#define R_OK 4
|
||
#endif
|
||
|
||
#if !defined (S_IROTH) && defined (R_OK)
|
||
# define S_IROTH R_OK
|
||
#endif
|
||
#if !defined (S_IWOTH) && defined (W_OK)
|
||
# define S_IWOTH W_OK
|
||
#endif
|
||
#if !defined (S_IXOTH) && defined (X_OK)
|
||
# define S_IXOTH X_OK
|
||
#endif
|
||
|
||
|
||
#ifdef _LIBC
|
||
|
||
#define group_member __group_member
|
||
#define euidaccess __euidaccess
|
||
|
||
#else
|
||
|
||
/* The user's real user id. */
|
||
static uid_t uid;
|
||
|
||
/* The user's real group id. */
|
||
static gid_t gid;
|
||
|
||
#ifdef HAVE_GETGROUPS
|
||
int group_member ();
|
||
#else
|
||
#define group_member(gid) 0
|
||
#endif
|
||
|
||
#endif
|
||
|
||
/* The user's effective user id. */
|
||
static uid_t euid;
|
||
|
||
/* The user's effective group id. */
|
||
static gid_t egid;
|
||
|
||
/* Nonzero if UID, GID, EUID, and EGID have valid values. */
|
||
static int have_ids;
|
||
|
||
|
||
/* Return 0 if the user has permission of type MODE on file PATH;
|
||
otherwise, return -1 and set `errno' to EACCESS.
|
||
Like access, except that it uses the effective user and group
|
||
id's instead of the real ones, and it does not check for read-only
|
||
filesystem, text busy, etc. */
|
||
|
||
int
|
||
euidaccess (path, mode)
|
||
const char *path;
|
||
int mode;
|
||
{
|
||
struct stat stats;
|
||
int granted;
|
||
|
||
#ifdef _LIBC
|
||
if (! __libc_enable_secure)
|
||
/* If we are not set-uid or set-gid, access does the same. */
|
||
return __access (path, mode);
|
||
#else
|
||
if (have_ids == 0)
|
||
{
|
||
have_ids = 1;
|
||
uid = getuid ();
|
||
gid = getgid ();
|
||
euid = geteuid ();
|
||
egid = getegid ();
|
||
}
|
||
|
||
if (uid == euid && gid == egid)
|
||
/* If we are not set-uid or set-gid, access does the same. */
|
||
return access (path, mode);
|
||
#endif
|
||
|
||
if (stat (path, &stats))
|
||
return -1;
|
||
|
||
mode &= (X_OK | W_OK | R_OK); /* Clear any bogus bits. */
|
||
#if R_OK != S_IROTH || W_OK != S_IWOTH || X_OK != S_IXOTH
|
||
?error Oops, portability assumptions incorrect.
|
||
#endif
|
||
|
||
if (mode == F_OK)
|
||
return 0; /* The file exists. */
|
||
|
||
#ifdef _LIBC
|
||
/* Now we need the IDs. */
|
||
if (have_ids == 0)
|
||
{
|
||
have_ids = 1;
|
||
euid = __geteuid ();
|
||
egid = __getegid ();
|
||
}
|
||
#endif
|
||
|
||
/* The super-user can read and write any file, and execute any file
|
||
that anyone can execute. */
|
||
if (euid == 0 && ((mode & X_OK) == 0
|
||
|| (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))))
|
||
return 0;
|
||
|
||
if (euid == stats.st_uid)
|
||
granted = (unsigned) (stats.st_mode & (mode << 6)) >> 6;
|
||
else if (egid == stats.st_gid || group_member (stats.st_gid))
|
||
granted = (unsigned) (stats.st_mode & (mode << 3)) >> 3;
|
||
else
|
||
granted = (stats.st_mode & mode);
|
||
if (granted == mode)
|
||
return 0;
|
||
__set_errno (EACCESS);
|
||
return -1;
|
||
}
|
||
#undef euidaccess
|
||
#ifdef weak_alias
|
||
weak_alias (__euidaccess, euidaccess)
|
||
#endif
|
||
|
||
#ifdef TEST
|
||
#include <stdio.h>
|
||
#include <errno.h>
|
||
#include "error.h"
|
||
|
||
char *program_name;
|
||
|
||
int
|
||
main (argc, argv)
|
||
int argc;
|
||
char **argv;
|
||
{
|
||
char *file;
|
||
int mode;
|
||
int err;
|
||
|
||
program_name = argv[0];
|
||
if (argc < 3)
|
||
abort ();
|
||
file = argv[1];
|
||
mode = atoi (argv[2]);
|
||
|
||
err = euidaccess (file, mode);
|
||
printf ("%d\n", err);
|
||
if (err != 0)
|
||
error (0, errno, "%s", file);
|
||
exit (0);
|
||
}
|
||
#endif
|