mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-03 04:01:43 +08:00
b85697f61d
1999-12-17 Ulrich Drepper <drepper@cygnus.com> * string/bits/string2.h (__strtok_r_1c): Help gcc optimizing string access. * locale/programs/ld-collate.c: Implement handling of absolute ellipsis. Parsing of file and constructing the internal data structures should now be complete. (collate_finish): Start adding support to generate the data structures which are written out to the file. * intl/dcgettext.c: Rewrite to handle caching of previous results here instead of in the dcgettext macro. * intl/libintl.h (dcgettext): Don't define for systems using this glibc or systems with tsearch. * sysdeps/generic/mathdef.h: Protect definitions for math.h against double inclusion. * sysdeps/alpha/fpu/bits/mathdef.h: Likewise. * sysdeps/i386/fpu/bits/mathdef.h: Likewise. * sysdeps/m68k/fpu/bits/mathdef.h: Likewise. * sysdeps/powerpc/fpu/bits/mathdef.h: Likewise. * sysdeps/i386/fpu/libm-test-ulps: Add more deltas (are mobile PIIs that different?). 1999-12-17 Andreas Jaeger <aj@suse.de> * rt/aio.h (struct aiocb64): Add member __next_prio to sync the struct with aiocb. * rt/Makefile (tests): Added tst-aio64. Added dependency rules for tst-aio64. * rt/tst-aio64.c: New file, copied from tst-aio.c and changed for 64bit tests. 1999-12-15 Thorsten Kukuk <kukuk@suse.de> * sysdeps/unix/sysv/linux/alpha/oldgetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/alpha/oldsetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/bits/resource.h: Change RLIM_INFINITY back to old value (signed long). * sysdeps/unix/sysv/linux/i386/bits/resource.h: New, with unsigned long RLIM_INFINITY. * sysdeps/unix/sysv/linux/getrlimit.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/getrlimit.c: ... here. * sysdeps/unix/sysv/linux/getrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/getrlimit64.c: ... here. * sysdeps/unix/sysv/linux/oldgetrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c: ... here. * sysdeps/unix/sysv/linux/oldsetrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/oldsetrlimit64.c: ... here. * sysdeps/unix/sysv/linux/setrlimit.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/setrlimit.c: ... here. * sysdeps/unix/sysv/linux/setrlimit64.c: Moved from here to ... * sysdeps/unix/sysv/linux/i386/setrlimit64.c: ... here. * sysdeps/unix/sysv/linux/sparc/bits/resource.h: New. * sysdeps/unix/sysv/linux/sparc/sparc64/oldgetrlimit64.c: Removed. * sysdeps/unix/sysv/linux/sparc/sparc64/oldsetrlimit64.c: Removed. 1999-12-17 Andreas Jaeger <aj@suse.de> * elf/ldconfig.c: Add new option -l to manualy link shared libraries. (options): Added option. (parse_opt): Set option. (main): Handle option. (manual_link): New function. 1999-12-17 Thorsten Kukuk <kukuk@suse.de> * string/bits/string2.h: Fix patch from 1999-12-07. 1999-12-16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/strsep.c: If delim string has only one character don't run over end of string. * locale/programs/ld-collate.c (insert_weights): Also update next pointer of last cursor element. (insert_value): Return nonzero value if nothing got inserted. (handle_ellipsis): Don't do anything if to-value cannot be inserted. 1999-12-10 Jakub Jelinek <jakub@redhat.com> * stdlib/longlong.h (__sparc_v9__): Use %rDIGIT instead of %DIGIT where appropriate. 1999-12-10 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c (__sigaction): Copy sa_flags into kernel sigaction structure. 1999-12-14 Andreas Jaeger <aj@suse.de> * string/tester.c (test_strsep): More tests for access beyond the final NUL. The first two tests come from PR libc/1486 by martinea@iro.umontreal.ca. 1999-12-14 Thorsten Kukuk <kukuk@suse.de> * nis/ypclnt.c: Correct handling of cached client handles. (__xdr_ypresp_all): Call callback function for errors, too, like Solaris does. * nis/nss_compat/compat-grp.c: Make sure errno is always set correct. * nis/nss_compat/compat-initgroups.c: Likewise. * nis/nss_compat/compat-spwd.c: Likewise. * nis/nss_nis/nis-alias.c: Likewise. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-netgrp.c: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. Also use services.byservicename Map if available, optimize query if name/port and protocol is known.
1256 lines
30 KiB
C
1256 lines
30 KiB
C
/* Copyright (C) 1996, 1997, 1998, 1999 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 <nss.h>
|
|
#include <errno.h>
|
|
#include <ctype.h>
|
|
#include <fcntl.h>
|
|
#include <netdb.h>
|
|
#include <shadow.h>
|
|
#include <string.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <nsswitch.h>
|
|
|
|
#include "netgroup.h"
|
|
#include "nss-nisplus.h"
|
|
#include "nisplus-parser.h"
|
|
|
|
static service_user *ni = NULL;
|
|
static bool_t use_nisplus = FALSE; /* default: passwd_compat: nis */
|
|
static nis_name pwdtable = NULL; /* Name of the password table */
|
|
static size_t pwdtablelen = 0;
|
|
|
|
/* Get the declaration of the parser function. */
|
|
#define ENTNAME spent
|
|
#define STRUCTURE spwd
|
|
#define EXTERN_PARSER
|
|
#include <nss/nss_files/files-parse.c>
|
|
|
|
/* Structure for remembering -@netgroup and -user members ... */
|
|
#define BLACKLIST_INITIAL_SIZE 512
|
|
#define BLACKLIST_INCREMENT 256
|
|
struct blacklist_t
|
|
{
|
|
char *data;
|
|
int current;
|
|
int size;
|
|
};
|
|
|
|
struct ent_t
|
|
{
|
|
bool_t netgroup;
|
|
bool_t nis;
|
|
bool_t first;
|
|
char *oldkey;
|
|
int oldkeylen;
|
|
nis_result *result;
|
|
FILE *stream;
|
|
struct blacklist_t blacklist;
|
|
struct spwd pwd;
|
|
struct __netgrent netgrdata;
|
|
};
|
|
typedef struct ent_t ent_t;
|
|
|
|
static ent_t ext_ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
|
|
{NULL, NULL, 0, 0, 0, 0, 0, 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 void
|
|
give_spwd_free (struct spwd *pwd)
|
|
{
|
|
if (pwd->sp_namp != NULL)
|
|
free (pwd->sp_namp);
|
|
if (pwd->sp_pwdp != NULL)
|
|
free (pwd->sp_pwdp);
|
|
|
|
memset (pwd, '\0', sizeof (struct spwd));
|
|
pwd->sp_warn = -1;
|
|
pwd->sp_inact = -1;
|
|
pwd->sp_expire = -1;
|
|
pwd->sp_flag = ~0ul;
|
|
}
|
|
|
|
static int
|
|
spwd_need_buflen (struct spwd *pwd)
|
|
{
|
|
int len = 0;
|
|
|
|
if (pwd->sp_pwdp != NULL)
|
|
len += strlen (pwd->sp_pwdp) + 1;
|
|
|
|
return len;
|
|
}
|
|
|
|
static void
|
|
copy_spwd_changes (struct spwd *dest, struct spwd *src,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
if (src->sp_pwdp != NULL && strlen (src->sp_pwdp))
|
|
{
|
|
if (buffer == NULL)
|
|
dest->sp_pwdp = strdup (src->sp_pwdp);
|
|
else if (dest->sp_pwdp &&
|
|
strlen (dest->sp_pwdp) >= strlen (src->sp_pwdp))
|
|
strcpy (dest->sp_pwdp, src->sp_pwdp);
|
|
else
|
|
{
|
|
dest->sp_pwdp = buffer;
|
|
strcpy (dest->sp_pwdp, src->sp_pwdp);
|
|
buffer += strlen (dest->sp_pwdp) + 1;
|
|
buflen = buflen - (strlen (dest->sp_pwdp) + 1);
|
|
}
|
|
}
|
|
if (src->sp_lstchg != 0)
|
|
dest->sp_lstchg = src->sp_lstchg;
|
|
if (src->sp_min != 0)
|
|
dest->sp_min = src->sp_min;
|
|
if (src->sp_max != 0)
|
|
dest->sp_max = src->sp_max;
|
|
if (src->sp_warn != -1)
|
|
dest->sp_warn = src->sp_warn;
|
|
if (src->sp_inact != -1)
|
|
dest->sp_inact = src->sp_inact;
|
|
if (src->sp_expire != -1)
|
|
dest->sp_expire = src->sp_expire;
|
|
if (src->sp_flag != ~0ul)
|
|
dest->sp_flag = src->sp_flag;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_setspent (ent_t *ent)
|
|
{
|
|
enum nss_status status = NSS_STATUS_SUCCESS;
|
|
|
|
ent->nis = ent->first = ent->netgroup = 0;
|
|
|
|
/* If something was left over free it. */
|
|
if (ent->netgroup)
|
|
__internal_endnetgrent (&ent->netgrdata);
|
|
|
|
if (ent->oldkey != NULL)
|
|
{
|
|
free (ent->oldkey);
|
|
ent->oldkey = NULL;
|
|
ent->oldkeylen = 0;
|
|
}
|
|
|
|
if (ent->result != NULL)
|
|
{
|
|
nis_freeresult (ent->result);
|
|
ent->result = NULL;
|
|
}
|
|
|
|
if (pwdtable == NULL)
|
|
{
|
|
static const char key[] = "passwd.org_dir.";
|
|
const char *local_dir = nis_local_directory ();
|
|
size_t len_local_dir = strlen (local_dir);
|
|
|
|
pwdtable = malloc (sizeof (key) + len_local_dir);
|
|
if (pwdtable == NULL)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
pwdtablelen = ((char *) mempcpy (mempcpy (pwdtable,
|
|
key, sizeof (key) - 1),
|
|
local_dir, len_local_dir + 1)
|
|
- pwdtable) - 1;
|
|
}
|
|
|
|
if (ent->blacklist.data != NULL)
|
|
{
|
|
ent->blacklist.current = 1;
|
|
ent->blacklist.data[0] = '|';
|
|
ent->blacklist.data[1] = '\0';
|
|
}
|
|
else
|
|
ent->blacklist.current = 0;
|
|
|
|
if (ent->stream == NULL)
|
|
{
|
|
ent->stream = fopen ("/etc/shadow", "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);
|
|
|
|
give_spwd_free (&ent->pwd);
|
|
|
|
return status;
|
|
}
|
|
|
|
|
|
enum nss_status
|
|
_nss_compat_setspent (void)
|
|
{
|
|
enum nss_status result;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (ni == NULL)
|
|
{
|
|
__nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
|
|
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
|
|
}
|
|
|
|
result = internal_setspent (&ext_ent);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static enum nss_status
|
|
internal_endspent (ent_t *ent)
|
|
{
|
|
if (ent->stream != NULL)
|
|
{
|
|
fclose (ent->stream);
|
|
ent->stream = NULL;
|
|
}
|
|
|
|
if (ent->netgroup)
|
|
__internal_endnetgrent (&ent->netgrdata);
|
|
|
|
ent->nis = ent->first = ent->netgroup = 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;
|
|
}
|
|
|
|
if (ent->blacklist.data != NULL)
|
|
{
|
|
ent->blacklist.current = 1;
|
|
ent->blacklist.data[0] = '|';
|
|
ent->blacklist.data[1] = '\0';
|
|
}
|
|
else
|
|
ent->blacklist.current = 0;
|
|
|
|
give_spwd_free (&ent->pwd);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_compat_endspent (void)
|
|
{
|
|
enum nss_status result;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
result = internal_endspent (&ext_ent);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static enum nss_status
|
|
getspent_next_nis_netgr (const char *name, struct spwd *result, ent_t *ent,
|
|
char *group, char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
char *ypdomain, *host, *user, *domain, *outval, *p, *p2;
|
|
int status, outvallen;
|
|
size_t p2len;
|
|
|
|
if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
|
|
{
|
|
ent->netgroup = 0;
|
|
ent->first = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (ent->first == TRUE)
|
|
{
|
|
bzero (&ent->netgrdata, sizeof (struct __netgrent));
|
|
__internal_setnetgrent (group, &ent->netgrdata);
|
|
ent->first = FALSE;
|
|
}
|
|
|
|
while (1)
|
|
{
|
|
char *saved_cursor;
|
|
int parse_res;
|
|
|
|
saved_cursor = ent->netgrdata.cursor;
|
|
status = __internal_getnetgrent_r (&host, &user, &domain,
|
|
&ent->netgrdata, buffer, buflen,
|
|
errnop);
|
|
if (status != 1)
|
|
{
|
|
__internal_endnetgrent (&ent->netgrdata);
|
|
ent->netgroup = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return NSS_STATUS_RETURN;
|
|
}
|
|
|
|
if (user == NULL || user[0] == '-')
|
|
continue;
|
|
|
|
if (domain != NULL && strcmp (ypdomain, domain) != 0)
|
|
continue;
|
|
|
|
/* If name != NULL, we are called from getpwnam */
|
|
if (name != NULL)
|
|
if (strcmp (user, name) != 0)
|
|
continue;
|
|
|
|
if (yp_match (ypdomain, "shadow.byname", user,
|
|
strlen (user), &outval, &outvallen)
|
|
!= YPERR_SUCCESS)
|
|
continue;
|
|
|
|
p2len = spwd_need_buflen (&ent->pwd);
|
|
if (p2len > buflen)
|
|
{
|
|
free (outval);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
p2 = buffer + (buflen - p2len);
|
|
buflen -= p2len;
|
|
if (buflen < ((size_t) outval + 1))
|
|
{
|
|
free (outval);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
p = strncpy (buffer, outval, buflen);
|
|
while (isspace (*p))
|
|
p++;
|
|
free (outval);
|
|
parse_res = _nss_files_parse_spent (p, result, data, buflen, errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
ent->netgrdata.cursor = saved_cursor;
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
if (parse_res)
|
|
{
|
|
/* Store the User in the blacklist for the "+" at the end of
|
|
/etc/passwd */
|
|
blacklist_store_name (result->sp_namp, ent);
|
|
copy_spwd_changes (result, &ent->pwd, p2, p2len);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
getspent_next_nisplus_netgr (const char *name, struct spwd *result,
|
|
ent_t *ent, char *group, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
char *ypdomain, *host, *user, *domain, *p2;
|
|
int status, parse_res;
|
|
size_t p2len;
|
|
nis_result *nisres;
|
|
|
|
/* Maybe we should use domainname here ? We need the current
|
|
domainname for the domain field in netgroups */
|
|
if (yp_get_default_domain (&ypdomain) != YPERR_SUCCESS)
|
|
{
|
|
ent->netgroup = 0;
|
|
ent->first = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (ent->first == TRUE)
|
|
{
|
|
bzero (&ent->netgrdata, sizeof (struct __netgrent));
|
|
__internal_setnetgrent (group, &ent->netgrdata);
|
|
ent->first = FALSE;
|
|
}
|
|
|
|
while (1)
|
|
{
|
|
char *saved_cursor;
|
|
|
|
saved_cursor = ent->netgrdata.cursor;
|
|
status = __internal_getnetgrent_r (&host, &user, &domain,
|
|
&ent->netgrdata, buffer, buflen,
|
|
errnop);
|
|
if (status != 1)
|
|
{
|
|
__internal_endnetgrent (&ent->netgrdata);
|
|
ent->netgroup = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return NSS_STATUS_RETURN;
|
|
}
|
|
|
|
if (user == NULL || user[0] == '-')
|
|
continue;
|
|
|
|
if (domain != NULL && strcmp (ypdomain, domain) != 0)
|
|
continue;
|
|
|
|
/* If name != NULL, we are called from getpwnam */
|
|
if (name != NULL)
|
|
if (strcmp (user, name) != 0)
|
|
continue;
|
|
|
|
p2len = spwd_need_buflen (&ent->pwd);
|
|
if (p2len > buflen)
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
p2 = buffer + (buflen - p2len);
|
|
buflen -= p2len;
|
|
{
|
|
char buf[strlen (user) + 30 + pwdtablelen];
|
|
sprintf (buf, "[name=%s],%s", user, pwdtable);
|
|
nisres = nis_list (buf, FOLLOW_LINKS | FOLLOW_PATH, NULL, NULL);
|
|
}
|
|
if (niserr2nss (nisres->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
nis_freeresult (nisres);
|
|
continue;
|
|
}
|
|
parse_res = _nss_nisplus_parse_spent (nisres, result, buffer,
|
|
buflen, errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
nis_freeresult (nisres);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
nis_freeresult (nisres);
|
|
|
|
if (parse_res)
|
|
{
|
|
/* Store the User in the blacklist for the "+" at the end of
|
|
/etc/passwd */
|
|
blacklist_store_name (result->sp_namp, ent);
|
|
copy_spwd_changes (result, &ent->pwd, p2, p2len);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
static enum nss_status
|
|
getspent_next_nisplus (struct spwd *result, ent_t *ent, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
int parse_res;
|
|
size_t p2len;
|
|
char *p2;
|
|
|
|
p2len = spwd_need_buflen (&ent->pwd);
|
|
if (p2len > buflen)
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
p2 = buffer + (buflen - p2len);
|
|
buflen -= p2len;
|
|
do
|
|
{
|
|
bool_t saved_first;
|
|
nis_result *saved_res;
|
|
|
|
if (ent->first)
|
|
{
|
|
saved_first = TRUE;
|
|
saved_res = ent->result;
|
|
|
|
ent->result = nis_first_entry (pwdtable);
|
|
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return niserr2nss (ent->result->status);
|
|
}
|
|
ent->first = FALSE;
|
|
}
|
|
else
|
|
{
|
|
nis_result *res;
|
|
|
|
saved_first = FALSE;
|
|
saved_res = ent->result;
|
|
|
|
res = nis_next_entry (pwdtable, &ent->result->cookie);
|
|
ent->result = res;
|
|
if (niserr2nss (ent->result->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
nis_freeresult (saved_res);
|
|
ent->nis = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return niserr2nss (ent->result->status);
|
|
}
|
|
}
|
|
parse_res = _nss_nisplus_parse_spent (ent->result, result, buffer,
|
|
buflen, errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
ent->first = saved_first;
|
|
nis_freeresult (ent->result);
|
|
ent->result = saved_res;
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
if (!saved_first)
|
|
nis_freeresult (saved_res);
|
|
}
|
|
if (parse_res &&
|
|
in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
|
|
parse_res = 0; /* if result->pw_name in blacklist,search next entry */
|
|
}
|
|
while (!parse_res);
|
|
|
|
copy_spwd_changes (result, &ent->pwd, p2, p2len);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
|
|
static enum nss_status
|
|
getspent_next_nis (struct spwd *result, ent_t *ent,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
char *domain, *outkey, *outval, *p, *p2;
|
|
int outkeylen, outvallen, parse_res;
|
|
size_t p2len;
|
|
|
|
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
p2len = spwd_need_buflen (&ent->pwd);
|
|
if (p2len > buflen)
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
p2 = buffer + (buflen - p2len);
|
|
buflen -= p2len;
|
|
do
|
|
{
|
|
bool_t saved_first;
|
|
char *saved_oldkey;
|
|
int saved_oldlen;
|
|
|
|
if (ent->first)
|
|
{
|
|
if (yp_first (domain, "shadow.byname", &outkey, &outkeylen,
|
|
&outval, &outvallen) != YPERR_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
if (buflen < ((size_t) outvallen + 1))
|
|
{
|
|
free (outval);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
saved_first = TRUE;
|
|
saved_oldkey = ent->oldkey;
|
|
saved_oldlen = ent->oldkeylen;
|
|
ent->oldkey = outkey;
|
|
ent->oldkeylen = outkeylen;
|
|
ent->first = FALSE;
|
|
}
|
|
else
|
|
{
|
|
if (yp_next (domain, "shadow.byname", ent->oldkey, ent->oldkeylen,
|
|
&outkey, &outkeylen, &outval, &outvallen)
|
|
!= YPERR_SUCCESS)
|
|
{
|
|
ent->nis = 0;
|
|
give_spwd_free (&ent->pwd);
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
if (buflen < ((size_t) outvallen + 1))
|
|
{
|
|
free (outval);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
saved_first = FALSE;
|
|
saved_oldkey = ent->oldkey;
|
|
saved_oldlen = ent->oldkeylen;
|
|
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;
|
|
parse_res = _nss_files_parse_spent (p, result, data, buflen, errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
free (ent->oldkey);
|
|
ent->oldkey = saved_oldkey;
|
|
ent->oldkeylen = saved_oldlen;
|
|
ent->first = saved_first;
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
else
|
|
{
|
|
if (!saved_first)
|
|
free (saved_oldkey);
|
|
}
|
|
if (parse_res &&
|
|
in_blacklist (result->sp_namp, strlen (result->sp_namp), ent))
|
|
parse_res = 0;
|
|
}
|
|
while (!parse_res);
|
|
|
|
copy_spwd_changes (result, &ent->pwd, p2, p2len);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
/* This function handle the +user entrys in /etc/shadow */
|
|
static enum nss_status
|
|
getspnam_plususer (const char *name, struct spwd *result, char *buffer,
|
|
size_t buflen, int *errnop)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
struct spwd pwd;
|
|
int parse_res;
|
|
char *p;
|
|
size_t plen;
|
|
|
|
memset (&pwd, '\0', sizeof (struct spwd));
|
|
pwd.sp_warn = -1;
|
|
pwd.sp_inact = -1;
|
|
pwd.sp_expire = -1;
|
|
pwd.sp_flag = ~0ul;
|
|
|
|
copy_spwd_changes (&pwd, result, NULL, 0);
|
|
|
|
plen = spwd_need_buflen (&pwd);
|
|
if (plen > buflen)
|
|
{
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
p = buffer + (buflen - plen);
|
|
buflen -= plen;
|
|
|
|
if (use_nisplus) /* Do the NIS+ query here */
|
|
{
|
|
nis_result *res;
|
|
char buf[strlen (name) + 24 + pwdtablelen];
|
|
|
|
sprintf(buf, "[name=%s],%s", name, pwdtable);
|
|
res = nis_list(buf, 0, NULL, NULL);
|
|
if (niserr2nss (res->status) != NSS_STATUS_SUCCESS)
|
|
{
|
|
enum nss_status status = niserr2nss (res->status);
|
|
|
|
nis_freeresult (res);
|
|
return status;
|
|
}
|
|
parse_res = _nss_nisplus_parse_spent (res, result, buffer,
|
|
buflen, errnop);
|
|
if (parse_res == -1)
|
|
{
|
|
nis_freeresult (res);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
nis_freeresult (res);
|
|
}
|
|
else /* Use NIS */
|
|
{
|
|
char *domain, *outval, *ptr;
|
|
int outvallen;
|
|
|
|
if (yp_get_default_domain (&domain) != YPERR_SUCCESS)
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
if (yp_match (domain, "shadow.byname", name, strlen (name),
|
|
&outval, &outvallen) != YPERR_SUCCESS)
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
if (buflen < ((size_t) outvallen + 1))
|
|
{
|
|
free (outval);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
ptr = strncpy (buffer, outval, buflen);
|
|
free (outval);
|
|
while (isspace (*ptr))
|
|
ptr++;
|
|
parse_res = _nss_files_parse_spent (ptr, result, data, buflen, errnop);
|
|
if (parse_res == -1)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
if (parse_res)
|
|
{
|
|
copy_spwd_changes (result, &pwd, p, plen);
|
|
give_spwd_free (&pwd);
|
|
/* We found the entry. */
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
else
|
|
{
|
|
/* Give buffer the old len back */
|
|
buflen += plen;
|
|
give_spwd_free (&pwd);
|
|
}
|
|
return NSS_STATUS_RETURN;
|
|
}
|
|
|
|
static enum nss_status
|
|
getspent_next_file (struct spwd *result, ent_t *ent,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
while (1)
|
|
{
|
|
fpos_t pos;
|
|
int parse_res = 0;
|
|
char *p;
|
|
|
|
do
|
|
{
|
|
fgetpos (ent->stream, &pos);
|
|
buffer[buflen - 1] = '\xff';
|
|
p = fgets (buffer, buflen, ent->stream);
|
|
if (p == NULL && feof (ent->stream))
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
if (p == NULL || buffer[buflen - 1] != '\xff')
|
|
{
|
|
fsetpos (ent->stream, &pos);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* 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_spent (p, result, data,
|
|
buflen, errnop)));
|
|
|
|
if (parse_res == -1)
|
|
{
|
|
/* The parser ran out of space. */
|
|
fsetpos (ent->stream, &pos);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
if (result->sp_namp[0] != '+' && result->sp_namp[0] != '-')
|
|
/* This is a real entry. */
|
|
break;
|
|
|
|
/* -@netgroup */
|
|
if (result->sp_namp[0] == '-' && result->sp_namp[1] == '@'
|
|
&& result->sp_namp[2] != '\0')
|
|
{
|
|
/* XXX Do not use fixed length buffers. */
|
|
char buf2[1024];
|
|
char *user, *host, *domain;
|
|
struct __netgrent netgrdata;
|
|
|
|
bzero (&netgrdata, sizeof (struct __netgrent));
|
|
__internal_setnetgrent (&result->sp_namp[2], &netgrdata);
|
|
while (__internal_getnetgrent_r (&host, &user, &domain,
|
|
&netgrdata, buf2, sizeof (buf2),
|
|
errnop))
|
|
{
|
|
if (user != NULL && user[0] != '-')
|
|
blacklist_store_name (user, ent);
|
|
}
|
|
__internal_endnetgrent (&netgrdata);
|
|
continue;
|
|
}
|
|
|
|
/* +@netgroup */
|
|
if (result->sp_namp[0] == '+' && result->sp_namp[1] == '@'
|
|
&& result->sp_namp[2] != '\0')
|
|
{
|
|
int status;
|
|
|
|
ent->netgroup = TRUE;
|
|
ent->first = TRUE;
|
|
copy_spwd_changes (&ent->pwd, result, NULL, 0);
|
|
|
|
if (use_nisplus)
|
|
status = getspent_next_nisplus_netgr (NULL, result, ent,
|
|
&result->sp_namp[2],
|
|
buffer, buflen, errnop);
|
|
else
|
|
status = getspent_next_nis_netgr (NULL, result, ent,
|
|
&result->sp_namp[2],
|
|
buffer, buflen, errnop);
|
|
if (status == NSS_STATUS_RETURN)
|
|
continue;
|
|
else
|
|
return status;
|
|
}
|
|
|
|
/* -user */
|
|
if (result->sp_namp[0] == '-' && result->sp_namp[1] != '\0'
|
|
&& result->sp_namp[1] != '@')
|
|
{
|
|
blacklist_store_name (&result->sp_namp[1], ent);
|
|
continue;
|
|
}
|
|
|
|
/* +user */
|
|
if (result->sp_namp[0] == '+' && result->sp_namp[1] != '\0'
|
|
&& result->sp_namp[1] != '@')
|
|
{
|
|
enum nss_status status;
|
|
|
|
/* Store the User in the blacklist for the "+" at the end of
|
|
/etc/passwd */
|
|
blacklist_store_name (&result->sp_namp[1], ent);
|
|
status = getspnam_plususer (&result->sp_namp[1], result, buffer,
|
|
buflen, errnop);
|
|
if (status == NSS_STATUS_SUCCESS) /* We found the entry. */
|
|
break;
|
|
else
|
|
if (status == NSS_STATUS_RETURN /* We couldn't parse the entry */
|
|
|| status == NSS_STATUS_NOTFOUND) /* entry doesn't exist */
|
|
continue;
|
|
else
|
|
{
|
|
if (status == NSS_STATUS_TRYAGAIN)
|
|
{
|
|
fsetpos (ent->stream, &pos);
|
|
*errnop = ERANGE;
|
|
}
|
|
return status;
|
|
}
|
|
}
|
|
|
|
/* +:... */
|
|
if (result->sp_namp[0] == '+' && result->sp_namp[1] == '\0')
|
|
{
|
|
ent->nis = TRUE;
|
|
ent->first = TRUE;
|
|
copy_spwd_changes (&ent->pwd, result, NULL, 0);
|
|
|
|
if (use_nisplus)
|
|
return getspent_next_nisplus (result, ent, buffer, buflen, errnop);
|
|
else
|
|
return getspent_next_nis (result, ent, buffer, buflen, errnop);
|
|
}
|
|
}
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
|
|
static enum nss_status
|
|
internal_getspent_r (struct spwd *pw, ent_t *ent,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
if (ent->netgroup)
|
|
{
|
|
int status;
|
|
|
|
/* We are searching members in a netgroup */
|
|
/* Since this is not the first call, we don't need the group name */
|
|
if (use_nisplus)
|
|
status = getspent_next_nisplus_netgr (NULL, pw, ent, NULL, buffer,
|
|
buflen, errnop);
|
|
else
|
|
status = getspent_next_nis_netgr (NULL, pw, ent, NULL, buffer, buflen,
|
|
errnop);
|
|
if (status == NSS_STATUS_RETURN)
|
|
return getspent_next_file (pw, ent, buffer, buflen, errnop);
|
|
else
|
|
return status;
|
|
}
|
|
else
|
|
if (ent->nis)
|
|
{
|
|
if (use_nisplus)
|
|
return getspent_next_nisplus (pw, ent, buffer, buflen, errnop);
|
|
else
|
|
return getspent_next_nis (pw, ent, buffer, buflen, errnop);
|
|
}
|
|
else
|
|
return getspent_next_file (pw, ent, buffer, buflen, errnop);
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_compat_getspent_r (struct spwd *pwd, char *buffer, size_t buflen,
|
|
int *errnop)
|
|
{
|
|
enum nss_status status = NSS_STATUS_SUCCESS;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
if (ni == NULL)
|
|
{
|
|
__nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
|
|
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
|
|
}
|
|
|
|
/* Be prepared that the setspent function was not called before. */
|
|
if (ext_ent.stream == NULL)
|
|
status = internal_setspent (&ext_ent);
|
|
|
|
if (status == NSS_STATUS_SUCCESS)
|
|
status = internal_getspent_r (pwd, &ext_ent, buffer, buflen, errnop);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
/* Searches in /etc/passwd and the NIS/NIS+ map for a special user */
|
|
static enum nss_status
|
|
internal_getspnam_r (const char *name, struct spwd *result, ent_t *ent,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
struct parser_data *data = (void *) buffer;
|
|
|
|
while (1)
|
|
{
|
|
fpos_t pos;
|
|
char *p;
|
|
int parse_res;
|
|
|
|
do
|
|
{
|
|
fgetpos (ent->stream, &pos);
|
|
buffer[buflen - 1] = '\xff';
|
|
p = fgets (buffer, buflen, ent->stream);
|
|
if (p == NULL && feof (ent->stream))
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
if (p == NULL || buffer[buflen - 1] != '\xff')
|
|
{
|
|
fsetpos (ent->stream, &pos);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* 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_spent (p, result, data, buflen,
|
|
errnop)));
|
|
|
|
if (parse_res == -1)
|
|
{
|
|
/* The parser ran out of space. */
|
|
fsetpos (ent->stream, &pos);
|
|
*errnop = ERANGE;
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
/* This is a real entry. */
|
|
if (result->sp_namp[0] != '+' && result->sp_namp[0] != '-')
|
|
{
|
|
if (strcmp (result->sp_namp, name) == 0)
|
|
return NSS_STATUS_SUCCESS;
|
|
else
|
|
continue;
|
|
}
|
|
|
|
/* -@netgroup */
|
|
if (result->sp_namp[0] == '-' && result->sp_namp[1] == '@'
|
|
&& result->sp_namp[2] != '\0')
|
|
{
|
|
/* XXX Do not use fixed length buffers. */
|
|
char buf2[1024];
|
|
char *user, *host, *domain;
|
|
struct __netgrent netgrdata;
|
|
|
|
bzero (&netgrdata, sizeof (struct __netgrent));
|
|
__internal_setnetgrent (&result->sp_namp[2], &netgrdata);
|
|
while (__internal_getnetgrent_r (&host, &user, &domain, &netgrdata,
|
|
buf2, sizeof (buf2), errnop))
|
|
{
|
|
if (user != NULL && user[0] != '-')
|
|
if (strcmp (user, name) == 0)
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
}
|
|
__internal_endnetgrent (&netgrdata);
|
|
continue;
|
|
}
|
|
|
|
/* +@netgroup */
|
|
if (result->sp_namp[0] == '+' && result->sp_namp[1] == '@'
|
|
&& result->sp_namp[2] != '\0')
|
|
{
|
|
char *buf = strdupa (&result->sp_namp[2]);
|
|
int status;
|
|
|
|
ent->netgroup = TRUE;
|
|
ent->first = TRUE;
|
|
copy_spwd_changes (&ent->pwd, result, NULL, 0);
|
|
|
|
do
|
|
{
|
|
if (use_nisplus)
|
|
status = getspent_next_nisplus_netgr (name, result, ent, buf,
|
|
buffer, buflen, errnop);
|
|
else
|
|
status = getspent_next_nis_netgr (name, result, ent, buf,
|
|
buffer, buflen, errnop);
|
|
if (status == NSS_STATUS_RETURN)
|
|
continue;
|
|
|
|
if (status == NSS_STATUS_SUCCESS
|
|
&& strcmp (result->sp_namp, name) == 0)
|
|
return NSS_STATUS_SUCCESS;
|
|
} while (status == NSS_STATUS_SUCCESS);
|
|
continue;
|
|
}
|
|
|
|
/* -user */
|
|
if (result->sp_namp[0] == '-' && result->sp_namp[1] != '\0'
|
|
&& result->sp_namp[1] != '@')
|
|
{
|
|
if (strcmp (&result->sp_namp[1], name) == 0)
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
continue;
|
|
}
|
|
|
|
/* +user */
|
|
if (result->sp_namp[0] == '+' && result->sp_namp[1] != '\0'
|
|
&& result->sp_namp[1] != '@')
|
|
{
|
|
if (strcmp (name, &result->sp_namp[1]) == 0)
|
|
{
|
|
enum nss_status status;
|
|
|
|
status = getspnam_plususer (name, result, buffer, buflen,
|
|
errnop);
|
|
if (status == NSS_STATUS_RETURN)
|
|
{
|
|
/* We couldn't parse the entry */
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
return status;
|
|
}
|
|
}
|
|
|
|
/* +:... */
|
|
if (result->sp_namp[0] == '+' && result->sp_namp[1] == '\0')
|
|
{
|
|
enum nss_status status;
|
|
|
|
status = getspnam_plususer (name, result, buffer, buflen, errnop);
|
|
if (status == NSS_STATUS_RETURN) /* We couldn't parse the entry */
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
else
|
|
return status;
|
|
}
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_compat_getspnam_r (const char *name, struct spwd *pwd,
|
|
char *buffer, size_t buflen, int *errnop)
|
|
{
|
|
ent_t ent = {0, 0, 0, NULL, 0, NULL, NULL, {NULL, 0, 0},
|
|
{NULL, NULL, 0, 0, 0, 0, 0, 0, 0}};
|
|
enum nss_status status;
|
|
|
|
if (name[0] == '-' || name[0] == '+')
|
|
{
|
|
*errnop = ENOENT;
|
|
return NSS_STATUS_NOTFOUND;
|
|
}
|
|
|
|
if (ni == NULL)
|
|
{
|
|
__nss_database_lookup ("shadow_compat", "passwd_compat", "nis", &ni);
|
|
use_nisplus = (strcmp (ni->name, "nisplus") == 0);
|
|
}
|
|
|
|
status = internal_setspent (&ent);
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
|
|
status = internal_getspnam_r (name, pwd, &ent, buffer, buflen, errnop);
|
|
|
|
internal_endspent (&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;
|
|
}
|