mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-11 15:50:06 +00:00
740152054e
1998-01-22 00:55 Ulrich Drepper <drepper@happy.cygnus.com> * libc.map: Add __libc_uid, __libc_pid, __syscall_rt_sigqueueinfo, __pread64, __pwrite64, and __getpid. * libc/rt/aio_misc.c: Use pread and pwrite instead of __ protected versions. 1998-01-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/alpha/syscalls.list: Define the cancelable socket functions as __libc_xxx with __xxx as weak alias. * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/m68k/socket.S: Allow __socket to be redefined. * sysdeps/unix/sysv/linux/i386/socket.S: Likewise. * sysdeps/unix/sysv/linux/arm/socket.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/socket.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/socket.S: Likewise. * sysdeps/unix/sysv/linux/accept.S: Make __libc_xxx the main name and __xxx a weak alias. * sysdeps/unix/sysv/linux/connect.S: Likewise. * sysdeps/unix/sysv/linux/recv.S: Likewise. * sysdeps/unix/sysv/linux/recvfrom.S: Likewise. * sysdeps/unix/sysv/linux/recvmsg.S: Likewise. * sysdeps/unix/sysv/linux/send.S: Likewise. * sysdeps/unix/sysv/linux/sendmsg.S: Likewise. * sysdeps/unix/sysv/linux/sendto.S: Likewise. 1998-01-21 Andreas Jaeger <aj@arthur.rhein-neckar.de> * locale/langinfo.h: Add defines. * dirent/dirent.h: Add defines for DT_*, check also for _DIRENT_HAVE_D_TYPE. Suggested by Roland McGrath. 1998-01-16 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/netinet/ip_fw.h: Update from Linux 2.1.73+79. * README.template: Update information about possible configurations. * manual/mbyte.texi (Wide String Conversion): Fix declaration of wcstombs. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>. [PR libc/417]. * manual/time.texi (Priority): Correct description of PRIO_MAX. Pointed out by Jochen Voss <voss@mathematik.uni-kl.de>. [PR libc/416]. 11998-01-21 21:34 Ulrich Drepper <drepper@cygnus.com> * sysdeps/alpha/fpu/bits/mathdef.h: Add definition of FP_ILOGB0 and FP_ILOGNAN. Patch by a sun <asun@zoology.washington.edu>. 1998-01-21 17:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/_strerror.c: Handle BUFLEN == 0. Reported by Andreas Jaeger. 1998-01-20 18:13 Ulrich Drepper <drepper@cygnus.com> * locale/programs/ld-collate.c: Little optimizations. * stdio-common/xbug.c: Unset LD_LIBRRARY_PATH variable. * string/Makefile (tests): Add tst-inlcall. * string/tst-inlcall.c: New file. * string/strsignal.c: Add support for real-time signals. * sysdeps/generic/_strerror.c: Fix Handling of unknown error in presense of small buffer. * sysdeps/i386/bits/string.h: Define _HAVE_STRING_ARCH_* macros. * sysdeps/i386/i486/bits/string.h: Correct strrchr implementation for i686. * sysdeps/unix/sysv/linux/siglist.c: Change length of arrays to _NSIG + 1. 1998-01-02 15:10 Matthias Urlichs <urlichs@noris.de> * Rules: Add explicit rule for dummy.o; at least one library needs it and it isn't autogenerated by the default rules. 1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/libm-test.c: Tweak epsilons. 1997-12-31 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/test-fenv.c (feenv_nomask_test): Avoid dumping core in the child. (feenv_mask_test): Likewise. 1998-01-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig: Don't export CPPFLAGS. 1998-01-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sunrpc/rpc_main.c (parseargs): Use perror to print error message. 1998-01-15 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/nss_db/db-alias.c (_nss_db_getaliasent_r): Don't include terminating null in key size. 1998-01-13 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/nss_files/files-service.c: Fix allocation size to include length of PROTO. * nss/nss_db/db-XXX.c (lookup): Always set errno and h_errno if applicable. Fix return value and error checking. (CONCAT(_nss_db_get,ENTNAME_r)): Loop around to skip over unparsable lines. (DB_LOOKUP): Allocate space for terminating null byte. * nss/db-Makefile ($(VAR_DB)/passwd.db): Don't handle duplicate uids specially. * db2/makedb.c (process_input): Continue processing if a duplicate key is encountered. 1998-01-19 15:20 Ulrich Drepper <drepper@cygnus.com> * time/tzfile.h: Updated from tzcode1998b. * time/zdump.c: Likewise. * time/zic.c: Likewise. * time/africa: Update from tzdata1998b. * time/antarctica: Likewise. * time/asia: Likewise. * time/australasia: Likewise. * time/etcetera: Likewise. * time/europe: Likewise. * time/leapseconds: Likewise. * time/northamerica: Likewise. * time/southamerica: Likewise. 1998-01-12 Andreas Jaeger <aj@arthur.rhein-neckar.de> * nss/nss_files/files-alias.c (get_next_alias): Do mail alias lookups ignoring case. * nss/nss_files/files-network.c: Do network lookups ignoring case. * nss/nss_files/files-hosts.c: Do hostname lookups ignoring case. * nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): New macro for case insensitive comparing. Patches by Cristian Gafton <gafton@redhat.com>. 1998-01-09 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/net/if.h: Add IFF_*defines. Suggested by Roland McGrath. [PR libc/395] 1998-01-08 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/arith.texi (Parsing of Integers): Correct description of strtoul. Pointed out by Scott Snyder <snyder@fnald0.fnal.gov>. [PR libc/396] 1997-12-30 14:14 Matthias Urlichs <urlichs@noris.de> * misc/lsearch.c (lsearch): Return a pointer to the new element if one was "allocated". 1997-12-26 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * string/strsignal.c: NSIG is not a valid index into _sys_siglist. Don't zap the last character of the "Unknown signal" message. 1998-01-19 15:08 Ulrich Drepper <drepper@cygnus.com> * locale/programs/charmap.c (parse_charmap): Correct parsing of ellipsis expressions. * locale/programs/charset.c (insert_char): Correctly insert value of eliipsis expression.
448 lines
11 KiB
C
448 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] = '\0';
|
||
line = fgets (first_unused, room_left, stream);
|
||
if (line == NULL)
|
||
/* Nothing to read. */
|
||
break;
|
||
else if (first_unused[room_left - 1] != '\0')
|
||
{
|
||
/* 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] = '\0';
|
||
line = fgets (first_unused, room_left, listfile);
|
||
if (line == NULL)
|
||
break;
|
||
if (first_unused[room_left - 1] != '\0')
|
||
{
|
||
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] = '\0';
|
||
line = fgets (first_unused, room_left, stream);
|
||
if (first_unused[room_left - 1] != '\0')
|
||
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;
|
||
}
|