mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
6973fc0127
1997-11-18 02:31 Ulrich Drepper <drepper@cygnus.com> * iconv/Makefile: New file. * iconv/gconv.c: New file. * iconv/gconv.h: New file. * iconv/gconv_builtin.c: New file. * iconv/gconv_builtin.h: New file. * iconv/gconv_close.c: New file. * iconv/gconv_conf.c: New file. * iconv/gconv_db.c: New file. * iconv/gconv_dl.c: New file. * iconv/gconv_open.c: New file. * iconv/gconv_simple.c: New file. * iconv/iconv.c: New file. * iconv/iconv.h: New file. * iconv/iconv_close.c: New file. * iconv/iconv_open.c: New file. * include/gconv.h: New file. * Makeconfig: Define gconvdir. * Makefile (subdirs): Add iconv. * string/bits/string2.h: Add optimization for strtok_r. * sysdeps/generic/_G_config.h: Define __need_NULL to get definition for NULL. Reported by H.J. Lu <hjl@gnu.ai.mit.edu>. * configure.in: Correct test for bash2. * locale/Makefile (CFLAGS-charmap.c): Add -Wno-char-subscripts. (CFLAGS-locfile.c): Likewise. Suggested by Zack Weinberg <zack@rabi.phys.columbia.edu>. * misc/hsearch_r.c (hsearch_r): Avoid undefinitely search for non-existing entry if the table is full. * posix/regex.h: Pretty print. * stdio-common/printf_fp.c: Don't define NDEBUG if already defined. * sysdeps/posix/ctermid.c: Simplify a bit. * sysdeps/unix/sysv/linux/net/if.h: Pretty print. 1997-11-17 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/sys/quota.h: Add include for <sys/types.h> instead of <asm/types.h>. 1997-11-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/libm-test.c (asin_test): Add epsilon for asin (0.5). 1997-11-16 17:09 H.J. Lu <hjl@gnu.ai.mit.edu> * libc.map (_IO_stdin_, _IO_stdout_, _IO_stderr_, _IO_fopen, fopen, freopen, _IO_fclose, fclose): Added to GLIBC_2.0. (_IO_stdin_, _IO_stdout_, _IO_stderr_): Removed from GLIBC_2.1. (_IO_2_1_stdin_, _IO_2_1_stdout_, _IO_2_1_stderr_, _IO_fclose, fclose): Added to GLIBC_2.1. * libio/Makefile (routines, shared-only-routines): Add oldiofclose. Remove oldfreopen. * libio/freopen.c (freopen): When PIC is defined, call _IO_old_freopen () for old stdio. * libio/iofclose.c (_IO_new_fclose): Renamed from _IO_fclose. (_IO_fclose, fclose): Use _IO_new_fclose as default version for GLIBC_2.1. * libio/iolibio.h (_IO_old_freopen): Use _IO_old_file_close_it instead of _IO_file_close_it. * libio/libio.h (_IO_stdin_, _IO_stdout_, _IO_stderr_): Changed to _IO_2_1_stdxxx_. (_IO_stdin, _IO_stdout, _IO_stderr): Declare as extern if _LIBC * libio/libioP.h (_IO_old_do_flush): New. * libio/oldfileops.c (_IO_old_file_close_it, _IO_old_file_finish, _IO_old_file_overflow, _IO_old_file_sync): Call _IO_old_do_flush () instead of _IO_do_flush (). (_IO_old_file_xsputn): Call _IO_old_do_write () instead of _IO_do_write (). * libio/oldiofopen.c (_IO_old_fopen): Call _IO_old_file_init () instead of _IO_file_init (). Bind old symbols to version GLIBC_2.0. * libio/oldstdfiles.c (DEF_STDFILE): Don't use symbol_version. (_IO_old_stdin_, _IO_old_stdout_, _IO_old_stderr_): Changed to _IO_stdxxx_. (_IO_check_libio): New function in .init. * libio/oldiofclose.c: New file. * libio/stdfiles.c (_IO_new_stdin_, _IO_new_stdout_, _IO_new_stderr_): Changed to _IO_2_1_stdxxx_. (DEF_STDFILE): Don't use default_symbol_version. * libio/stdio.c (stdin, stdout, stderr): Set to _IO_2_1_stdxxx_._ (_IO_stdin, _IO_stdout, _IO_stderr): New, strong alias of stdxxx. * csu/Makefile (distribute): Add init.c. (extra-objs): Add init.o for ELF. (start-installed-name): Add $(objpfx)init.o. * csu/init.c: New file. 1997-11-12 08:02 H.J. Lu <hjl@gnu.ai.mit.edu> * elf/dl-lookup.c (do_lookup): Don't use the hidden base definition as the default. 1997-08-27 Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de> * erand48_r.c (__erand48_r): Implement for 32 bit short int. 1997-11-15 Andreas Jaeger <aj@arthur.rhein-neckar.de> * elf/genrtldtbl.awk: Replace gensub for compatibility with gawk2 (PR 351). 1997-11-16 21:01 Philip Blundell <Philip.Blundell@pobox.com> * sysdeps/arm/sysdep.h: Use __APCS_32__ to decide whether or not to preserve condition codes on function call. 1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/generic/s_exp2l.c: Change exp2l to __ieee754_exp2l. 1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm-test.c (asin_test): Add epsilon for float. (tan_test): Add epsilon for float. (log1p_test): Add epsilon for float. (inverse_functions): Add epsilons. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [socket]: Add net/if_packet.h. * sysdeps/unix/sysv/linux/Dist: Add net/if_packet.h. 1997-11-10 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * md5-crypt/Makefile (extra-objs): Make recursively expanded variable, since $(object-suffixes) is not defined yet. 1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * db2/Makefile (distribute): db185/db185_int.src -> db185/db185_int.h. 1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * misc/tst-fdset.c: Don't require the value of FD_ISSET to be exactly one. 1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/generic/e_acoshl.c: Fix stub_warning: use the user level * sysdeps/generic/e_acosl.c: Likewise. * sysdeps/generic/e_asinl.c: Likewise. * sysdeps/generic/e_atan2l.c: Likewise. * sysdeps/generic/e_expl.c: Likewise. * sysdeps/generic/e_fmodl.c: Likewise. * sysdeps/generic/e_j0l.c: Likewise. * sysdeps/generic/e_j1l.c: Likewise. * sysdeps/generic/e_jnl.c: Likewise. * sysdeps/generic/e_lgammal_r.c: Likewise. * sysdeps/generic/e_log10l.c: Likewise. * sysdeps/generic/e_logl.c: Likewise. * sysdeps/generic/e_powl.c: Likewise. * sysdeps/generic/e_sqrtl.c: Likewise. * sysdeps/generic/e_exp2l.c: Likewise. 1997-11-11 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Make-dist (+sysdep-names): Remove extra paren. * Makefile (distribute): Add stub-tag.h. * elf/Makefile (distribute): Add atomicity.h. * stdlib/Makefile (headers): Add ucontext.h and sys/ucontext.h. * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=socket]: Add net/if_packet.h. * sysdeps/alpha/Dist: Remove setjmp_aux.c. * sysdeps/unix/sysv/linux/Dist: Add s_pread64.c, s_pwrite64.c, net/if_packet.h, scsi/sg.h. 1997-11-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile (install): Quote $(CC) expansion. 1997-11-14 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Added caching of working /proc cwd and no restrictions on path length. Following some ideas from Andi Kleen <ak@muc.de> (PR 350). 1997-11-14 19:14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nss_compat/compat-grp.c: Remove buggy assert call. 1997-11-14 22:23 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-i387/s_fdim.S: New file. * sysdeps/libm-i387/s_fdimf.S: New file. * sysdeps/libm-i387/s_fdiml.S: New file. * sysdeps/libm-i387/i686/s_fdim.S: New file. * sysdeps/libm-i387/i686/s_fdimf.S: New file. * sysdeps/libm-i387/i686/s_fdiml.S: New file. 1997-11-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/bits/string2.h (strstr): Avoid warning if HAYSTACK is a pointer to unsigned char. 1997-11-13 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_llrintf.c (__llrintf): Fix function. * sysdeps/libm-ieee754/s_lrintf.c (__lrintf): Fix function. * sysdeps/libm-ieee754/s_lrint.c (__lrint): Fix function. 1997-11-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/libm-ieee754/s_ilogbf.c: Correct return values for ilogb(0/NaN). * sysdeps/libm-ieee754/s_ilogbl.c: Likewise. * sysdeps/libm-ieee754/s_ilogb.c: Likewise. 1997-11-14 05:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/libm-i387/s_fmin.S: New file. * sysdeps/libm-i387/s_fminf.S: New file. * sysdeps/libm-i387/s_fminl.S: New file. * sysdeps/libm-i387/s_fmax.S: New file. * sysdeps/libm-i387/s_fmaxf.S: New file. * sysdeps/libm-i387/s_fmaxl.S: New file. * sysdeps/libm-i387/i686/s_fmin.S: New file. * sysdeps/libm-i387/i686/s_fminf.S: New file. * sysdeps/libm-i387/i686/s_fminl.S: New file. * sysdeps/libm-i387/i686/s_fmax.S: New file. * sysdeps/libm-i387/i686/s_fmaxf.S: New file. * sysdeps/libm-i387/i686/s_fmaxl.S: New file. 1997-11-14 03:06 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/accept.S: Add __libc_accept as alias. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/connect.S: Likewise. Reported by Christopher Wiles <wileyc@ai.cs.fujitsu.co.jp>. See ChangeLog.7 for earlier changes.
935 lines
22 KiB
C
935 lines
22 KiB
C
/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
|
|
|
|
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. */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <nss.h>
|
|
#include <grp.h>
|
|
#include <ctype.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <string.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <nsswitch.h>
|
|
|
|
#include "nss-nisplus.h"
|
|
#include "nisplus-parser.h"
|
|
|
|
static service_user *ni = NULL;
|
|
static bool_t use_nisplus = FALSE; /* default: group_compat: nis */
|
|
static nis_name grptable = NULL; /* Name of the group table */
|
|
static size_t grptablelen = 0;
|
|
|
|
/* Get the declaration of the parser function. */
|
|
#define ENTNAME grent
|
|
#define STRUCTURE group
|
|
#define EXTERN_PARSER
|
|
#include <nss/nss_files/files-parse.c>
|
|
|
|
/* Structure for remembering -group members ... */
|
|
#define BLACKLIST_INITIAL_SIZE 512
|
|
#define BLACKLIST_INCREMENT 256
|
|
struct blacklist_t
|
|
{
|
|
char *data;
|
|
int current;
|
|
int size;
|
|
};
|
|
|
|
struct ent_t
|
|
{
|
|
bool_t nis;
|
|
bool_t nis_first;
|
|
char *oldkey;
|
|
int oldkeylen;
|
|
nis_result *result;
|
|
FILE *stream;
|
|
struct blacklist_t blacklist;
|
|
};
|
|
typedef struct ent_t ent_t;
|
|
|
|
static ent_t ext_ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
|
|
|
|
/* Protect global state against multiple changers. */
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
/* Prototypes for local functions. */
|
|
static void blacklist_store_name (const char *, ent_t *);
|
|
static int in_blacklist (const char *, int, ent_t *);
|
|
|
|
static enum nss_status
|
|
_nss_first_init (void)
|
|
{
|
|
if (ni == NULL)
|
|
{
|
|
__nss_database_lookup ("group_compat", NULL, "nis", &ni);
|
|
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
|
|
}
|
|
|
|
if (grptable == NULL)
|
|
{
|
|
static const char key[] = "group.org_dir.";
|
|
const char *local_dir = nis_local_directory ();
|
|
size_t len_local_dir = strlen (local_dir);
|
|
|
|
grptable = malloc (sizeof (key) + len_local_dir);
|
|
if (grptable == NULL)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
grptablelen = ((char *) mempcpy (mempcpy (grptable,
|
|
key, sizeof (key) - 1),
|
|
local_dir, len_local_dir + 1)
|
|
- grptable) - 1;
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_setgrent (ent_t *ent)
|
|
{
|
|
enum nss_status status = NSS_STATUS_SUCCESS;
|
|
|
|
ent->nis = ent->nis_first = 0;
|
|
|
|
if (_nss_first_init () != NSS_STATUS_SUCCESS)
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
if (ent->oldkey != NULL)
|
|
{
|
|
free (ent->oldkey);
|
|
ent->oldkey = NULL;
|
|
ent->oldkeylen = 0;
|
|
}
|
|
|
|
if (ent->result != NULL)
|
|
{
|
|
nis_freeresult (ent->result);
|
|
ent->result = NULL;
|
|
}
|
|
|
|
ent->blacklist.current = 0;
|
|
if (ent->blacklist.data != NULL)
|
|
ent->blacklist.data[0] = '\0';
|
|
|
|
if (ent->stream == NULL)
|
|
{
|
|
ent->stream = fopen ("/etc/group", "r");
|
|
|
|
if (ent->stream == NULL)
|
|
status = errno == EAGAIN ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL;
|
|
else
|
|
{
|
|
/* We have to make sure the file is `closed on exec'. */
|
|
int result, flags;
|
|
|
|
result = flags = fcntl (fileno (ent->stream), F_GETFD, 0);
|
|
if (result >= 0)
|
|
{
|
|
flags |= FD_CLOEXEC;
|
|
result = fcntl (fileno (ent->stream), F_SETFD, flags);
|
|
}
|
|
if (result < 0)
|
|
{
|
|
/* Something went wrong. Close the stream and return a
|
|
failure. */
|
|
fclose (ent->stream);
|
|
ent->stream = NULL;
|
|
status = NSS_STATUS_UNAVAIL;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
rewind (ent->stream);
|
|
|
|
return status;
|
|
}
|
|
|
|
|
|
enum nss_status
|
|
_nss_compat_setgrent (void)
|
|
{
|
|
enum nss_status result;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
result = internal_setgrent (&ext_ent);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static enum nss_status
|
|
internal_endgrent (ent_t *ent)
|
|
{
|
|
if (ent->stream != NULL)
|
|
{
|
|
fclose (ent->stream);
|
|
ent->stream = NULL;
|
|
}
|
|
|
|
ent->nis = ent->nis_first = 0;
|
|
|
|
if (ent->oldkey != NULL)
|
|
{
|
|
free (ent->oldkey);
|
|
ent->oldkey = NULL;
|
|
ent->oldkeylen = 0;
|
|
}
|
|
|
|
if (ent->result != NULL)
|
|
{
|
|
nis_freeresult (ent->result);
|
|
ent->result = NULL;
|
|
}
|
|
|
|
ent->blacklist.current = 0;
|
|
if (ent->blacklist.data != NULL)
|
|
ent->blacklist.data[0] = '\0';
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_compat_endgrent (void)
|
|
{
|
|
enum nss_status result;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
result = internal_endgrent (&ext_ent);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
static enum nss_status
|
|
getgrent_next_nis (struct group *result, ent_t *ent, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
char *domain;
|
|
char *outkey, *outval;
|
|
int outkeylen, outvallen, parse_res;
|
|
char *p;
|
|
|
|
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
do
|
|
{
|
|
char *save_oldkey;
|
|
int save_oldlen;
|
|
bool_t save_nis_first;
|
|
|
|
if (ent->nis_first)
|
|
{
|
|
if (yp_first (domain, "group.byname", &outkey, &outkeylen,
|
|
&outval, &outvallen) != YPERR_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
save_oldkey = ent->oldkey;
|
|
save_oldlen = ent->oldkeylen;
|
|
save_nis_first = TRUE;
|
|
ent->oldkey = outkey;
|
|
ent->oldkeylen = outkeylen;
|
|
ent->nis_first = FALSE;
|
|
}
|
|
else
|
|
{
|
|
if (yp_next (domain, "group.byname", ent->oldkey, ent->oldkeylen,
|
|
&outkey, &outkeylen, &outval, &outvallen)
|
|
!= YPERR_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
save_oldkey = ent->oldkey;
|
|
save_oldlen = ent->oldkeylen;
|
|
save_nis_first = FALSE;
|
|
ent->oldkey = outkey;
|
|
ent->oldkeylen = outkeylen;
|
|
}
|
|
|
|
/* Copy the found data to our buffer */
|
|
p = strncpy (buffer, outval, buflen);
|
|
|
|
/* ...and free the data. */
|
|
free (outval);
|
|
|
|
while (isspace (*p))
|
|
++p;
|
|
|
|
if ((parse_res = _nss_files_parse_grent (p, result, data, buflen)) == -1)
|
|
{
|
|
free (ent->oldkey);
|
|
ent->oldkey = save_oldkey;
|
|
ent->oldkeylen = save_oldlen;
|
|
ent->nis_first = save_nis_first;
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
if (!save_nis_first)
|
|
free (save_oldkey);
|
|
}
|
|
|
|
if (parse_res &&
|
|
in_blacklist (result->gr_name, strlen (result->gr_name), ent))
|
|
parse_res = 0; /* if result->gr_name in blacklist,search next entry */
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
getgrent_next_nisplus (struct group *result, ent_t *ent, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
int parse_res;
|
|
|
|
do
|
|
{
|
|
nis_result *save_oldres;
|
|
bool_t save_nis_first;
|
|
|
|
if (ent->nis_first)
|
|
{
|
|
save_oldres = ent->result;
|
|
save_nis_first = TRUE;
|
|
ent->result = nis_first_entry(grptable);
|
|
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
return niserr2nss (ent->result->status);
|
|
}
|
|
ent->nis_first = FALSE;
|
|
}
|
|
else
|
|
{
|
|
nis_result *res;
|
|
|
|
save_oldres = ent->result;
|
|
save_nis_first = FALSE;
|
|
res = nis_next_entry(grptable, &ent->result->cookie);
|
|
ent->result = res;
|
|
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
return niserr2nss (ent->result->status);
|
|
}
|
|
}
|
|
if ((parse_res = _nss_nisplus_parse_grent (ent->result, 0, result,
|
|
buffer, buflen)) == -1)
|
|
{
|
|
nis_freeresult (ent->result);
|
|
ent->result = save_oldres;
|
|
ent->nis_first = save_nis_first;
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
if (!save_nis_first)
|
|
nis_freeresult (save_oldres);
|
|
}
|
|
|
|
if (parse_res &&
|
|
in_blacklist (result->gr_name, strlen (result->gr_name), ent))
|
|
parse_res = 0; /* if result->gr_name in blacklist,search next entry */
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
/* This function handle the +group entrys in /etc/group */
|
|
static enum nss_status
|
|
getgrnam_plusgroup (const char *name, struct group *result, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
int parse_res;
|
|
|
|
if (use_nisplus) /* Do the NIS+ query here */
|
|
{
|
|
nis_result *res;
|
|
char buf[strlen (name) + 24 + grptablelen];
|
|
|
|
sprintf(buf, "[name=%s],%s", name, grptable);
|
|
res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
|
|
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
enum nss_status status = niserr2nss (res->status);
|
|
|
|
nis_freeresult (res);
|
|
return status;
|
|
}
|
|
if ((parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer,
|
|
buflen)) == -1)
|
|
{
|
|
__set_errno (ERANGE);
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
nis_freeresult (res);
|
|
}
|
|
else /* Use NIS */
|
|
{
|
|
char *domain, *outval, *p;
|
|
int outvallen;
|
|
|
|
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
if (yp_match (domain, "group.byname", name, strlen (name),
|
|
&outval, &outvallen) != YPERR_SUCCESS)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
p = strncpy (buffer, outval,
|
|
buflen < (size_t) outvallen ? buflen : (size_t) outvallen);
|
|
free (outval);
|
|
while (isspace (*p))
|
|
p++;
|
|
if ((parse_res = _nss_files_parse_grent (p, result, data, buflen)) == -1)
|
|
{
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
}
|
|
|
|
if (parse_res)
|
|
/* We found the entry. */
|
|
return NSS_STATUS_SUCCESS;
|
|
else
|
|
return NSS_STATUS_RETURN;
|
|
}
|
|
|
|
static enum nss_status
|
|
getgrent_next_file (struct group *result, ent_t *ent,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
while (1)
|
|
{
|
|
fpos_t pos;
|
|
int parse_res = 0;
|
|
char *p;
|
|
|
|
do
|
|
{
|
|
fgetpos (ent->stream, &pos);
|
|
p = fgets (buffer, buflen, ent->stream);
|
|
if (p == NULL)
|
|
{
|
|
if (feof (ent->stream))
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
{
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
}
|
|
|
|
/* Terminate the line for any case. */
|
|
buffer[buflen - 1] = '\0';
|
|
|
|
/* Skip leading blanks. */
|
|
while (isspace (*p))
|
|
++p;
|
|
}
|
|
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
|
|
/* Parse the line. If it is invalid, loop to
|
|
get the next line of the file to parse. */
|
|
!(parse_res = _nss_files_parse_grent (p, result, data, buflen)));
|
|
|
|
if (parse_res == -1)
|
|
{
|
|
/* The parser ran out of space. */
|
|
fsetpos (ent->stream, &pos);
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
if (result->gr_name[0] != '+' && result->gr_name[0] != '-')
|
|
/* This is a real entry. */
|
|
break;
|
|
|
|
/* -group */
|
|
if (result->gr_name[0] == '-' && result->gr_name[1] != '\0'
|
|
&& result->gr_name[1] != '@')
|
|
{
|
|
blacklist_store_name (&result->gr_name[1], ent);
|
|
continue;
|
|
}
|
|
|
|
/* +group */
|
|
if (result->gr_name[0] == '+' && result->gr_name[1] != '\0'
|
|
&& result->gr_name[1] != '@')
|
|
{
|
|
enum nss_status status;
|
|
|
|
/* Store the group in the blacklist for the "+" at the end of
|
|
/etc/group */
|
|
blacklist_store_name (&result->gr_name[1], ent);
|
|
status = getgrnam_plusgroup (&result->gr_name[1], result, buffer,
|
|
buflen);
|
|
if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
|
|
break;
|
|
else
|
|
if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
|
|
continue;
|
|
else
|
|
return status;
|
|
}
|
|
|
|
/* +:... */
|
|
if (result->gr_name[0] == '+' && result->gr_name[1] == '\0')
|
|
{
|
|
ent->nis = TRUE;
|
|
ent->nis_first = TRUE;
|
|
|
|
if (use_nisplus)
|
|
return getgrent_next_nisplus (result, ent, buffer, buflen);
|
|
else
|
|
return getgrent_next_nis (result, ent, buffer, buflen);
|
|
}
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
|
|
static enum nss_status
|
|
internal_getgrent_r (struct group *gr, ent_t *ent, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
if (ent->nis)
|
|
{
|
|
if (use_nisplus)
|
|
return getgrent_next_nisplus (gr, ent, buffer, buflen);
|
|
else
|
|
return getgrent_next_nis (gr, ent, buffer, buflen);
|
|
}
|
|
else
|
|
return getgrent_next_file (gr, ent, buffer, buflen);
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_compat_getgrent_r (struct group *grp, char *buffer, size_t buflen)
|
|
{
|
|
enum nss_status status = NSS_STATUS_SUCCESS;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
/* Be prepared that the setgrent function was not called before. */
|
|
if (ext_ent.stream == NULL)
|
|
status = internal_setgrent (&ext_ent);
|
|
|
|
if (status == NSS_STATUS_SUCCESS)
|
|
status = internal_getgrent_r (grp, &ext_ent, buffer, buflen);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
/* Searches in /etc/group and the NIS/NIS+ map for a special group */
|
|
static enum nss_status
|
|
internal_getgrnam_r (const char *name, struct group *result, ent_t *ent,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
while (1)
|
|
{
|
|
fpos_t pos;
|
|
int parse_res = 0;
|
|
char *p;
|
|
|
|
do
|
|
{
|
|
fgetpos (ent->stream, &pos);
|
|
p = fgets (buffer, buflen, ent->stream);
|
|
if (p == NULL)
|
|
{
|
|
if (feof (ent->stream))
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
{
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
}
|
|
|
|
/* Terminate the line for any case. */
|
|
buffer[buflen - 1] = '\0';
|
|
|
|
/* Skip leading blanks. */
|
|
while (isspace (*p))
|
|
++p;
|
|
}
|
|
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
|
|
/* Parse the line. If it is invalid, loop to
|
|
get the next line of the file to parse. */
|
|
!(parse_res = _nss_files_parse_grent (p, result, data, buflen)));
|
|
|
|
if (parse_res == -1)
|
|
{
|
|
/* The parser ran out of space. */
|
|
fsetpos (ent->stream, &pos);
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* This is a real entry. */
|
|
if (result->gr_name[0] != '+' && result->gr_name[0] != '-')
|
|
{
|
|
if (strcmp (result->gr_name, name) == 0)
|
|
return NSS_STATUS_SUCCESS;
|
|
else
|
|
continue;
|
|
}
|
|
|
|
/* -group */
|
|
if (result->gr_name[0] == '-' && result->gr_name[1] != '\0'
|
|
&& result->gr_name[1] != '@')
|
|
{
|
|
if (strcmp (&result->gr_name[1], name) == 0)
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
continue;
|
|
}
|
|
|
|
/* +group */
|
|
if (result->gr_name[0] == '+' && result->gr_name[1] != '\0'
|
|
&& result->gr_name[1] != '@')
|
|
{
|
|
if (strcmp (name, &result->gr_name[1]) == 0)
|
|
{
|
|
enum nss_status status;
|
|
|
|
status = getgrnam_plusgroup (name, result, buffer, buflen);
|
|
if (status == NSS_STATUS_RETURN)
|
|
/* We couldn't parse the entry */
|
|
continue;
|
|
else
|
|
return status;
|
|
}
|
|
}
|
|
/* +:... */
|
|
if (result->gr_name[0] == '+' && result->gr_name[1] == '\0')
|
|
{
|
|
enum nss_status status;
|
|
|
|
status = getgrnam_plusgroup (name, result, buffer, buflen);
|
|
if (status == NSS_STATUS_RETURN)
|
|
/* We couldn't parse the entry */
|
|
continue;
|
|
else
|
|
return status;
|
|
}
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_compat_getgrnam_r (const char *name, struct group *grp,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
|
|
enum nss_status status;
|
|
|
|
if (name[0] == '-' || name[0] == '+')
|
|
return NSS_STATUS_NOTFOUND;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_setgrent (&ent);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
|
|
status = internal_getgrnam_r (name, grp, &ent, buffer, buflen);
|
|
|
|
internal_endgrent (&ent);
|
|
|
|
return status;
|
|
}
|
|
|
|
/* This function handle the + entry in /etc/group */
|
|
static enum nss_status
|
|
getgrgid_plusgroup (gid_t gid, struct group *result, char *buffer,
|
|
size_t buflen)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
int parse_res;
|
|
|
|
if (use_nisplus) /* Do the NIS+ query here */
|
|
{
|
|
nis_result *res;
|
|
char buf[24 + grptablelen];
|
|
|
|
sprintf(buf, "[gid=%d],%s", gid, grptable);
|
|
res = nis_list(buf, FOLLOW_PATH | FOLLOW_LINKS, NULL, NULL);
|
|
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
enum nss_status status = niserr2nss (res->status);
|
|
|
|
nis_freeresult (res);
|
|
return status;
|
|
}
|
|
if ((parse_res = _nss_nisplus_parse_grent (res, 0, result, buffer,
|
|
buflen)) == -1)
|
|
{
|
|
__set_errno (ERANGE);
|
|
nis_freeresult (res);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
nis_freeresult (res);
|
|
}
|
|
else /* Use NIS */
|
|
{
|
|
char buf[24];
|
|
char *domain, *outval, *p;
|
|
int outvallen;
|
|
|
|
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
snprintf (buf, sizeof (buf), "%d", gid);
|
|
|
|
if (yp_match (domain, "group.bygid", buf, strlen (buf),
|
|
&outval, &outvallen) != YPERR_SUCCESS)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
p = strncpy (buffer, outval,
|
|
buflen < (size_t) outvallen ? buflen : (size_t) outvallen);
|
|
free (outval);
|
|
while (isspace (*p))
|
|
p++;
|
|
if ((parse_res = _nss_files_parse_grent (p, result, data, buflen)) == -1)
|
|
{
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
}
|
|
|
|
if (parse_res)
|
|
/* We found the entry. */
|
|
return NSS_STATUS_SUCCESS;
|
|
else
|
|
return NSS_STATUS_RETURN;
|
|
}
|
|
|
|
/* Searches in /etc/group and the NIS/NIS+ map for a special group id */
|
|
static enum nss_status
|
|
internal_getgrgid_r (gid_t gid, struct group *result, ent_t *ent,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
while (1)
|
|
{
|
|
fpos_t pos;
|
|
int parse_res = 0;
|
|
char *p;
|
|
|
|
do
|
|
{
|
|
fgetpos (ent->stream, &pos);
|
|
p = fgets (buffer, buflen, ent->stream);
|
|
if (p == NULL)
|
|
{
|
|
if (feof (ent->stream))
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
{
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
}
|
|
|
|
/* Terminate the line for any case. */
|
|
buffer[buflen - 1] = '\0';
|
|
|
|
/* Skip leading blanks. */
|
|
while (isspace (*p))
|
|
++p;
|
|
}
|
|
while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */
|
|
/* Parse the line. If it is invalid, loop to
|
|
get the next line of the file to parse. */
|
|
!(parse_res = _nss_files_parse_grent (p, result, data, buflen)));
|
|
|
|
if (parse_res == -1)
|
|
{
|
|
/* The parser ran out of space. */
|
|
fsetpos (ent->stream, &pos);
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* This is a real entry. */
|
|
if (result->gr_name[0] != '+' && result->gr_name[0] != '-')
|
|
{
|
|
if (result->gr_gid == gid)
|
|
return NSS_STATUS_SUCCESS;
|
|
else
|
|
continue;
|
|
}
|
|
|
|
/* -group */
|
|
if (result->gr_name[0] == '-' && result->gr_name[1] != '\0'
|
|
&& result->gr_name[1] != '@')
|
|
{
|
|
blacklist_store_name (&result->gr_name[1], ent);
|
|
continue;
|
|
}
|
|
|
|
/* +group */
|
|
if (result->gr_name[0] == '+' && result->gr_name[1] != '\0'
|
|
&& result->gr_name[1] != '@')
|
|
{
|
|
enum nss_status status;
|
|
|
|
/* Store the group in the blacklist for the "+" at the end of
|
|
/etc/group */
|
|
blacklist_store_name (&result->gr_name[1], ent);
|
|
status = getgrnam_plusgroup (&result->gr_name[1], result, buffer,
|
|
buflen);
|
|
if (status == NSS_STATUS_SUCCESS && result->gr_gid == gid)
|
|
break;
|
|
else
|
|
continue;
|
|
}
|
|
/* +:... */
|
|
if (result->gr_name[0] == '+' && result->gr_name[1] == '\0')
|
|
{
|
|
enum nss_status status;
|
|
|
|
status = getgrgid_plusgroup (gid, result, buffer, buflen);
|
|
if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
return status;
|
|
}
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_compat_getgrgid_r (gid_t gid, struct group *grp,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
ent_t ent = {0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0}};
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_setgrent (&ent);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
|
|
status = internal_getgrgid_r (gid, grp, &ent, buffer, buflen);
|
|
|
|
internal_endgrent (&ent);
|
|
|
|
return status;
|
|
}
|
|
|
|
|
|
/* Support routines for remembering -@netgroup and -user entries.
|
|
The names are stored in a single string with `|' as separator. */
|
|
static void
|
|
blacklist_store_name (const char *name, ent_t *ent)
|
|
{
|
|
int namelen = strlen (name);
|
|
char *tmp;
|
|
|
|
/* first call, setup cache */
|
|
if (ent->blacklist.size == 0)
|
|
{
|
|
ent->blacklist.size = MAX (BLACKLIST_INITIAL_SIZE, 2 * namelen);
|
|
ent->blacklist.data = malloc (ent->blacklist.size);
|
|
if (ent->blacklist.data == NULL)
|
|
return;
|
|
ent->blacklist.data[0] = '|';
|
|
ent->blacklist.data[1] = '\0';
|
|
ent->blacklist.current = 1;
|
|
}
|
|
else
|
|
{
|
|
if (in_blacklist (name, namelen, ent))
|
|
return; /* no duplicates */
|
|
|
|
if (ent->blacklist.current + namelen + 1 >= ent->blacklist.size)
|
|
{
|
|
ent->blacklist.size += MAX (BLACKLIST_INCREMENT, 2 * namelen);
|
|
tmp = realloc (ent->blacklist.data, ent->blacklist.size);
|
|
if (tmp == NULL)
|
|
{
|
|
free (ent->blacklist.data);
|
|
ent->blacklist.size = 0;
|
|
return;
|
|
}
|
|
ent->blacklist.data = tmp;
|
|
}
|
|
}
|
|
|
|
tmp = stpcpy (ent->blacklist.data + ent->blacklist.current, name);
|
|
*tmp++ = '|';
|
|
*tmp = '\0';
|
|
ent->blacklist.current += namelen + 1;
|
|
|
|
return;
|
|
}
|
|
|
|
/* returns TRUE if ent->blacklist contains name, else FALSE */
|
|
static bool_t
|
|
in_blacklist (const char *name, int namelen, ent_t *ent)
|
|
{
|
|
char buf[namelen + 3];
|
|
char *cp;
|
|
|
|
if (ent->blacklist.data == NULL)
|
|
return FALSE;
|
|
|
|
buf[0] = '|';
|
|
cp = stpcpy (&buf[1], name);
|
|
*cp++= '|';
|
|
*cp = '\0';
|
|
return strstr (ent->blacklist.data, buf) != NULL;
|
|
}
|