mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
7ef90c1595
1998-09-14 11:26 Ulrich Drepper <drepper@cygnus.com> * wcsmbs/wcsmbs-tst1.c: Include stdlib.h. 1998-09-14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * libc-work/nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent): Convert port in network byte order. 1998-09-14 07:53 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * stdlib/stdlib.h: Add a switch, __need_malloc_and_calloc, to provide only malloc and calloc. * include/stdlib.h: Support the above. * string/bits/string2.h: Use __need_malloc_and_calloc when including stdlib.h. (__string2_1bptr_p): Avoid -Wbad-function-cast warnings. * iconvdata/iso-2022-jp.c: Include <stdlib.h>. * iconvdata/iso646.c: Include <stdlib.h>. 1998-09-14 07:51 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * sunrpc/rpc_cout.c: Add braces around ambiguous else. * sysdeps/libm-ieee754/w_pow.c: Likewise. * sysdeps/libm-ieee754/w_powf.c: Likewise. * sysdeps/libm-ieee754/w_powl.c: Likewise. 1998-09-14 07:57 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu> * stdio-common/stdio_lim.h.in: New file. All parameters are adjustable at build time. * Rules: Add a rule to build bits/stdio_lim.h from stdio-common/stdio_lim.h.in. (It has to be in Rules so that all subdirectories know how to make the file. It can't be in Makerules because then it gets built at top level and the dependencies are wrong.) * stdio-common/Makefile (distribute): Add stdio_lim.h.in. * sysdeps/unix/sysv/linux/Makefile: Delete rules to make stdio_lim.h. * sysdeps/unix/sysv/linux/stdio_lim.h.in: Removed. * sysdeps/unix/sysv/linux/Dist: Take out stdio_lim.h.in. * sysdeps/posix/Makefile: Removed. * sysdeps/posix/mk-stdiolim.c: Removed. * sysdeps/generic/bits/stdio_lim.h: Removed. 1998-09-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * argp/argp-help.c: Fixup indentation. * nss/nss_files/files-alias.c: Quiet -Wparentheses warning. * resolv/nss_dns/dns-network.c: Likewise. * resolv/res_send.c: Likewise. * rt/aio_cancel.c: Likewise. * rt/aio_misc.c: Likewise. 1998-09-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makefile (install-symbolic-link): Remove the link list file at last. * Makerules (install-clean-symbolic-link-list): Removed. 1998-09-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * timezone/tst-timezone.c: Print time in UTC to get consistent output. 1998-09-12 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/rtld.c (_dl_rpath): Removed. * elf/dl-support.c (_dl_path): Removed. * elf/Makefile ($(objpfx)ld.so): Don't pass -rpath. (CFLAGS-dl-support.c): Removed. * elf/dl-load.c (env_path_list): Renamed from fake_path_list. All uses changed. (_dl_init_paths): Always set env_path_list from LD_LIBRARY_PATH, instead of appending it to the main map's rpath info. (_dl_map_object): Consistently use LD_LIBRARY_PATH after all DT_RPATHs. This makes it effective again. (decompose_rpath): Remove second parameter, callers changed. (fillin_rpath): Allocate enough space in curwd. (expand_dynamic_string_token): Cope with get_origin returning -1. 1998-09-14 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * libc-work/nis/nss_compat/compat-pwd.c: Add support for passwd.adjunct. * nis/nss_nis/nis-pwd.c (_nss_nis_getpwent_r): Correct test for invalid password. 1998-09-13 18:06 Ulrich Drepper <drepper@cygnus.com> * locale/programs/locale.c: Update dates.
450 lines
11 KiB
C
450 lines
11 KiB
C
/* Mail alias file parser in nss_files module.
|
||
Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
|
||
This file is part of the GNU C Library.
|
||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 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 <aliases.h>
|
||
#include <ctype.h>
|
||
#include <errno.h>
|
||
#include <fcntl.h>
|
||
#include <bits/libc-lock.h>
|
||
#include <stdlib.h>
|
||
#include <stdio.h>
|
||
#include <string.h>
|
||
|
||
#include "nsswitch.h"
|
||
|
||
/* Locks the static variables in this file. */
|
||
__libc_lock_define_initialized (static, lock)
|
||
|
||
/* Maintenance of the shared stream open on the database file. */
|
||
|
||
static FILE *stream;
|
||
static fpos_t position;
|
||
static enum { none, getent, getby } last_use;
|
||
|
||
|
||
static enum nss_status
|
||
internal_setent (void)
|
||
{
|
||
enum nss_status status = NSS_STATUS_SUCCESS;
|
||
|
||
if (stream == NULL)
|
||
{
|
||
stream = fopen ("/etc/aliases", "r");
|
||
|
||
if (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 (stream), F_GETFD, 0);
|
||
if (result >= 0)
|
||
{
|
||
flags |= FD_CLOEXEC;
|
||
result = fcntl (fileno (stream), F_SETFD, flags);
|
||
}
|
||
if (result < 0)
|
||
{
|
||
/* Something went wrong. Close the stream and return a
|
||
failure. */
|
||
fclose (stream);
|
||
stream = NULL;
|
||
status = NSS_STATUS_UNAVAIL;
|
||
}
|
||
}
|
||
}
|
||
else
|
||
rewind (stream);
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
/* Thread-safe, exported version of that. */
|
||
enum nss_status
|
||
_nss_files_setaliasent (void)
|
||
{
|
||
enum nss_status status;
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
status = internal_setent ();
|
||
|
||
if (status == NSS_STATUS_SUCCESS && fgetpos (stream, &position) < 0)
|
||
{
|
||
fclose (stream);
|
||
stream = NULL;
|
||
status = NSS_STATUS_UNAVAIL;
|
||
}
|
||
|
||
last_use = getent;
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
/* Close the database file. */
|
||
static void
|
||
internal_endent (void)
|
||
{
|
||
if (stream != NULL)
|
||
{
|
||
fclose (stream);
|
||
stream = NULL;
|
||
}
|
||
}
|
||
|
||
|
||
/* Thread-safe, exported version of that. */
|
||
enum nss_status
|
||
_nss_files_endaliasent (void)
|
||
{
|
||
__libc_lock_lock (lock);
|
||
|
||
internal_endent ();
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return NSS_STATUS_SUCCESS;
|
||
}
|
||
|
||
/* Parsing the database file into `struct aliasent' data structures. */
|
||
static enum nss_status
|
||
get_next_alias (const char *match, struct aliasent *result,
|
||
char *buffer, size_t buflen, int *errnop)
|
||
{
|
||
enum nss_status status = NSS_STATUS_NOTFOUND;
|
||
int ignore = 0;
|
||
|
||
result->alias_members_len = 0;
|
||
|
||
while (1)
|
||
{
|
||
/* Now we are ready to process the input. We have to read a
|
||
line and all its continuations and construct the array of
|
||
string pointers. This pointers and the names itself have to
|
||
be placed in BUFFER. */
|
||
char *first_unused = buffer;
|
||
size_t room_left = buflen - (buflen % __alignof__ (char *));
|
||
char *line;
|
||
|
||
/* Read the first line. It must contain the alias name and
|
||
possibly some alias names. */
|
||
first_unused[room_left - 1] = '\xff';
|
||
line = fgets (first_unused, room_left, stream);
|
||
if (line == NULL)
|
||
/* Nothing to read. */
|
||
break;
|
||
else if (first_unused[room_left - 1] != '\xff')
|
||
{
|
||
/* The line is too long for our buffer. */
|
||
no_more_room:
|
||
*errnop = ERANGE;
|
||
status = NSS_STATUS_TRYAGAIN;
|
||
break;
|
||
}
|
||
else
|
||
{
|
||
char *cp;
|
||
|
||
/* If we are in IGNORE mode and the first character in the
|
||
line is a white space we ignore the line and start
|
||
reading the next. */
|
||
if (ignore && isspace (*first_unused))
|
||
continue;
|
||
|
||
/* Terminate the line for any case. */
|
||
cp = strpbrk (first_unused, "#\n");
|
||
if (cp != NULL)
|
||
*cp = '\0';
|
||
|
||
/* Skip leading blanks. */
|
||
while (isspace (*line))
|
||
++line;
|
||
|
||
result->alias_name = first_unused;
|
||
while (*line != '\0' && *line != ':')
|
||
*first_unused++ = *line++;
|
||
if (*line == '\0' || result->alias_name == first_unused)
|
||
/* No valid name. Ignore the line. */
|
||
continue;
|
||
|
||
*first_unused++ = '\0';
|
||
if (room_left < (size_t) (first_unused - result->alias_name))
|
||
goto no_more_room;
|
||
room_left -= first_unused - result->alias_name;
|
||
++line;
|
||
|
||
/* When we search for a specific alias we can avoid all the
|
||
difficult parts and compare now with the name we are
|
||
looking for. If it does not match we simply ignore all
|
||
lines until the next line containing the start of a new
|
||
alias is found. */
|
||
ignore = (match != NULL
|
||
&& __strcasecmp (result->alias_name, match) != 0);
|
||
|
||
while (! ignore)
|
||
{
|
||
while (isspace (*line))
|
||
++line;
|
||
|
||
cp = first_unused;
|
||
while (*line != '\0' && *line != ',')
|
||
*first_unused++ = *line++;
|
||
|
||
if (first_unused != cp)
|
||
{
|
||
/* OK, we can have a regular entry or an include
|
||
request. */
|
||
if (*line != '\0')
|
||
++line;
|
||
*first_unused++ = '\0';
|
||
|
||
if (strncmp (cp, ":include:", 9) != 0)
|
||
{
|
||
if (room_left < (first_unused - cp) + sizeof (char *))
|
||
goto no_more_room;
|
||
room_left -= (first_unused - cp) + sizeof (char *);
|
||
|
||
++result->alias_members_len;
|
||
}
|
||
else
|
||
{
|
||
/* Oh well, we have to read the addressed file. */
|
||
FILE *listfile;
|
||
char *old_line = NULL;
|
||
|
||
first_unused = cp;
|
||
|
||
listfile = fopen (&cp[9], "r");
|
||
/* If the file does not exist we simply ignore
|
||
the statement. */
|
||
if (listfile != NULL
|
||
&& (old_line = strdup (line)) != NULL)
|
||
{
|
||
while (! feof (listfile))
|
||
{
|
||
first_unused[room_left - 1] = '\xff';
|
||
line = fgets (first_unused, room_left, listfile);
|
||
if (line == NULL)
|
||
break;
|
||
if (first_unused[room_left - 1] != '\xff')
|
||
{
|
||
free (old_line);
|
||
goto no_more_room;
|
||
}
|
||
|
||
/* Parse the line. */
|
||
cp = strpbrk (line, "#\n");
|
||
if (cp != NULL)
|
||
*cp = '\0';
|
||
|
||
do
|
||
{
|
||
while (isspace (*line))
|
||
++line;
|
||
|
||
cp = first_unused;
|
||
while (*line != '\0' && *line != ',')
|
||
*first_unused++ = *line++;
|
||
|
||
if (*line != '\0')
|
||
++line;
|
||
|
||
if (first_unused != cp)
|
||
{
|
||
*first_unused++ = '\0';
|
||
if (room_left < ((first_unused - cp)
|
||
+ __alignof__ (char *)))
|
||
{
|
||
free (old_line);
|
||
goto no_more_room;
|
||
}
|
||
room_left -= ((first_unused - cp)
|
||
+ __alignof__ (char *));
|
||
++result->alias_members_len;
|
||
}
|
||
}
|
||
while (*line != '\0');
|
||
}
|
||
fclose (listfile);
|
||
|
||
first_unused[room_left - 1] = '\0';
|
||
strncpy (first_unused, old_line, room_left);
|
||
|
||
if (old_line != NULL)
|
||
free (old_line);
|
||
|
||
if (first_unused[room_left - 1] != '\0')
|
||
goto no_more_room;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (*line == '\0')
|
||
{
|
||
/* Get the next line. But we must be careful. We
|
||
must not read the whole line at once since it
|
||
might belong to the current alias. Simply read
|
||
the first character. If it is a white space we
|
||
have a continuation line. Otherwise it is the
|
||
beginning of a new alias and we can push back the
|
||
just read character. */
|
||
int ch;
|
||
|
||
ch = fgetc (stream);
|
||
if (ch == EOF || ch == '\n' || !isspace (ch))
|
||
{
|
||
size_t cnt;
|
||
|
||
/* Now prepare the return. Provide string
|
||
pointers for the currently selected aliases. */
|
||
if (ch != EOF)
|
||
ungetc (ch, stream);
|
||
|
||
/* Adjust the pointer so it is aligned for
|
||
storing pointers. */
|
||
first_unused += __alignof__ (char *) - 1;
|
||
first_unused -= ((first_unused - (char *) 0)
|
||
% __alignof__ (char *));
|
||
result->alias_members = (char **) first_unused;
|
||
|
||
/* Compute addresses of alias entry strings. */
|
||
cp = result->alias_name;
|
||
for (cnt = 0; cnt < result->alias_members_len; ++cnt)
|
||
{
|
||
cp = strchr (cp, '\0') + 1;
|
||
result->alias_members[cnt] = cp;
|
||
}
|
||
|
||
status = (result->alias_members_len == 0
|
||
? NSS_STATUS_RETURN : NSS_STATUS_SUCCESS);
|
||
break;
|
||
}
|
||
|
||
/* The just read character is a white space and so
|
||
can be ignored. */
|
||
first_unused[room_left - 1] = '\xff';
|
||
line = fgets (first_unused, room_left, stream);
|
||
if (first_unused[room_left - 1] != '\xff')
|
||
goto no_more_room;
|
||
cp = strpbrk (line, "#\n");
|
||
if (cp != NULL)
|
||
*cp = '\0';
|
||
}
|
||
}
|
||
}
|
||
|
||
if (status != NSS_STATUS_NOTFOUND)
|
||
/* We read something. In any case break here. */
|
||
break;
|
||
}
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
enum nss_status
|
||
_nss_files_getaliasent_r (struct aliasent *result, char *buffer, size_t buflen,
|
||
int *errnop)
|
||
{
|
||
/* Return next entry in host file. */
|
||
enum nss_status status = NSS_STATUS_SUCCESS;
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
/* Be prepared that the set*ent function was not called before. */
|
||
if (stream == NULL)
|
||
status = internal_setent ();
|
||
|
||
if (status == NSS_STATUS_SUCCESS)
|
||
{
|
||
/* If the last use was not by the getent function we need the
|
||
position the stream. */
|
||
if (last_use != getent)
|
||
{
|
||
if (fsetpos (stream, &position) < 0)
|
||
status = NSS_STATUS_UNAVAIL;
|
||
else
|
||
last_use = getent;
|
||
}
|
||
|
||
if (status == NSS_STATUS_SUCCESS)
|
||
{
|
||
result->alias_local = 1;
|
||
|
||
/* Read lines until we get a definite result. */
|
||
do
|
||
status = get_next_alias (NULL, result, buffer, buflen, errnop);
|
||
while (status == NSS_STATUS_RETURN);
|
||
|
||
/* If we successfully read an entry remember this position. */
|
||
if (status == NSS_STATUS_SUCCESS)
|
||
fgetpos (stream, &position);
|
||
else
|
||
last_use = none;
|
||
}
|
||
}
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|
||
|
||
|
||
enum nss_status
|
||
_nss_files_getaliasbyname_r (const char *name, struct aliasent *result,
|
||
char *buffer, size_t buflen, int *errnop)
|
||
{
|
||
/* Return next entry in host file. */
|
||
enum nss_status status = NSS_STATUS_SUCCESS;
|
||
|
||
if (name == NULL)
|
||
{
|
||
__set_errno (EINVAL);
|
||
return NSS_STATUS_UNAVAIL;
|
||
}
|
||
|
||
__libc_lock_lock (lock);
|
||
|
||
/* Open the stream or rest it. */
|
||
status = internal_setent ();
|
||
last_use = getby;
|
||
|
||
if (status == NSS_STATUS_SUCCESS)
|
||
{
|
||
result->alias_local = 1;
|
||
|
||
/* Read lines until we get a definite result. */
|
||
do
|
||
status = get_next_alias (name, result, buffer, buflen, errnop);
|
||
while (status == NSS_STATUS_RETURN);
|
||
}
|
||
|
||
internal_endent ();
|
||
|
||
__libc_lock_unlock (lock);
|
||
|
||
return status;
|
||
}
|