mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-19 03:20:05 +00:00
f8b87ef0d4
Thu Dec 12 03:32:21 1996 Ulrich Drepper <drepper@cygnus.com> * libio/_G_config.h: Add definition of _G_int16_t, _G_int32_t, _G_uint16_t, _G_uin32_t, _G_HAVE_BOOL, _G_HAVE_MMAP, and _G_ARGS. Change libio buffer handling to allocate internal buffers using mmap if possible. * libio/filedoalloc.c (_IO_file_doallocate): Change call to ALLOC_BUF. * libio/genops.c (_IO_setb, _IO_default_finish): Change call to FREE_BUF. (_IO_default_doallocate): Change call to ALLOC_BUF. * libio/libioP.h: Change definition of ALLOC_BUF and FREE_BUF to use mmap/munmap when possible. * libio/memstream.c: Don't use ALLOC_BUF, but directly malloc. * libio/vasprintf.c: Likewise. Patch by HJ Lu. * libio/libio.h: Define NULL as __null only for gcc-2.8 and up. * libio/libioP.h: Likewise. * libio/fileops.c (_IO_file_read, _IO_file_write): Don't restart syscall when EINTR was returned. Necessary for POSIX.1. * libio/strops.c (_IO_str_overflow): Add cast to prevent warning. * new-malloc/malloc.c (heap_trim): Correctly place parentheses to prevent warnings. * nis/Makefile: Remove rules for bsd-tools which are not part of glibc. Patch by Thorsten Kukuk. * nis/ypclnt.c: Add prototype for xdr_free. Add const to first parameter for __yp_bind. * nis/nss_compat/compat-pwd.c (getpwent_next_netgr, getpwent_next_nis, getpwent_next_file): Variable `p2len' must have type size_t. * nis/nss_nis/nis-alias.c: Add casts to prevent warnings. * 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-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/rpcsvc/yp_prot.h (ypreq_key): Change type of members to `const char *'. (ypmaplist): Change member names to `map' and `next' and provide #defines for old names. Patch by Thorsten Kukuk. * nss/nss_files/files-parse.c (parse_line, parse_list): Change type for `datalen' parameter to size_t. * shsdow/lckpwdf.c: Use fcntl forlocking, not flock. * stdio-common/printf.c [USE_IN_LIBIO]: Provide alias _IO_printf for printf. * stdio-common/sscanf.c [USE_IN_LIBIO]: Provide alias _IO_sscanf for sscanf. Patch by HJ Lu. * stdio-common/tmpfile.c: Update copyright. * stdio-common/vfscanf.c: Correctly handle EINTR error from fgetc function. Don't eat white space for `C' format. * stdlib/tst-strtol.c [~0UL != 0xffffffff]: Fix typo in test data. * sysdeps/generic/abort.c: Update copyright. De-ANSI-declfy. * sysdeps/i386/abort.c: Removed. This version does not use signal SIGABRT. * sysdeps/i386/fpu/__math.h: Define __NO_MATH_INLINES if not using gcc-2.8 or up. Patch by HJ Lu. * sysdeps/posix/tempname.c: Test for error but EEXIST after open call. If EMFILE, ENFILE, or EINTR return with error. Wed Dec 11 14:43:52 1996 Ulrich Drepper <drepper@cygnus.com> * gnu-versions.h: Set _GNU_OBSTACK_INTERFACE_VERSION back to 1. We are compatible again. * new-malloc/obstack.h (struct obstack): Add back alloc_failed bit even though it is not used. * malloc/obstack.h: Likewise. * new-malloc/obstack.c (_obstack_begin, _obstack_begin_1): Initialize alloc_failed bit to 0. * time/strftime.c: Extend for Emacs' needs. Recognize field width, %P format and `0' modifier. Tue Dec 10 21:20:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (make-link): Don't discard exit codes of intermediate commands. Always use rellns-sh if symbolic links are available. Tue Dec 10 20:09:51 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/netinet/in.h: Enclose #include <linux/in.h> in __BEGIN_DECLS/__END_DECLS to avoid linkage conflict of ntohs etc. in <asm/byteorder.h>.
257 lines
5.8 KiB
C
257 lines
5.8 KiB
C
/* Copyright (C) 1996 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 <netdb.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <libc-lock.h>
|
|
#include <rpcsvc/yp.h>
|
|
#include <rpcsvc/ypclnt.h>
|
|
|
|
#include "nss-nis.h"
|
|
|
|
|
|
/* The parser is defined in a different module. */
|
|
extern int _nss_files_parse_servent (char *line, struct servent *result,
|
|
char *data, size_t datalen);
|
|
|
|
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
struct intern_t
|
|
{
|
|
bool_t new_start;
|
|
char *oldkey;
|
|
int oldkeylen;
|
|
};
|
|
typedef struct intern_t intern_t;
|
|
|
|
static intern_t intern = {TRUE, NULL, 0};
|
|
|
|
static enum nss_status
|
|
internal_nis_setservent (intern_t * intern)
|
|
{
|
|
intern->new_start = 1;
|
|
if (intern->oldkey != NULL)
|
|
{
|
|
free (intern->oldkey);
|
|
intern->oldkey = NULL;
|
|
intern->oldkeylen = 0;
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
enum nss_status
|
|
_nss_nis_setservent (void)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_setservent (&intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_endservent (intern_t * intern)
|
|
{
|
|
intern->new_start = 1;
|
|
if (intern->oldkey != NULL)
|
|
{
|
|
free (intern->oldkey);
|
|
intern->oldkey = NULL;
|
|
intern->oldkeylen = 0;
|
|
}
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_endservent (void)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_endservent (&intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
static enum nss_status
|
|
internal_nis_getservent_r (struct servent *serv, char *buffer,
|
|
size_t buflen, intern_t *data)
|
|
{
|
|
char *domain;
|
|
char *result;
|
|
int len, parse_res;
|
|
char *outkey;
|
|
int keylen;
|
|
char *p;
|
|
|
|
if (yp_get_default_domain (&domain))
|
|
return NSS_STATUS_UNAVAIL;
|
|
|
|
/* Get the next entry until we found a correct one. */
|
|
do
|
|
{
|
|
enum nss_status retval;
|
|
|
|
if (data->new_start)
|
|
retval = yperr2nss (yp_first (domain, "services.byname",
|
|
&outkey, &keylen, &result, &len));
|
|
else
|
|
retval = yperr2nss ( yp_next (domain, "services.byname",
|
|
data->oldkey, data->oldkeylen,
|
|
&outkey, &keylen, &result, &len));
|
|
|
|
if (retval != NSS_STATUS_SUCCESS)
|
|
{
|
|
if (retval == NSS_STATUS_TRYAGAIN)
|
|
__set_errno (EAGAIN);
|
|
return retval;
|
|
}
|
|
|
|
if ((size_t) (len + 1) > buflen)
|
|
{
|
|
free (result);
|
|
__set_errno (ERANGE);
|
|
return NSS_STATUS_TRYAGAIN;
|
|
}
|
|
|
|
p = strncpy (buffer, result, len);
|
|
buffer[len] = '\0';
|
|
while (isspace (*p))
|
|
++p;
|
|
free (result);
|
|
|
|
parse_res = _nss_files_parse_servent (p, serv, buffer, buflen);
|
|
if (!parse_res && errno == ERANGE)
|
|
return NSS_STATUS_TRYAGAIN;
|
|
|
|
free (data->oldkey);
|
|
data->oldkey = outkey;
|
|
data->oldkeylen = keylen;
|
|
data->new_start = 0;
|
|
}
|
|
while (!parse_res);
|
|
|
|
return NSS_STATUS_SUCCESS;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservent_r (struct servent *serv, char *buffer, size_t buflen)
|
|
{
|
|
enum nss_status status;
|
|
|
|
__libc_lock_lock (lock);
|
|
|
|
status = internal_nis_getservent_r (serv, buffer, buflen, &intern);
|
|
|
|
__libc_lock_unlock (lock);
|
|
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservbyname_r (const char *name, char *protocol,
|
|
struct servent *serv, char *buffer, size_t buflen)
|
|
{
|
|
intern_t data = {TRUE, NULL, 0};
|
|
enum nss_status status;
|
|
int found;
|
|
|
|
if (name == NULL || protocol == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
status = internal_nis_setservent (&data);
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
|
|
found = 0;
|
|
while (!found &&
|
|
((status = internal_nis_getservent_r (serv, buffer, buflen, &data))
|
|
== NSS_STATUS_SUCCESS))
|
|
{
|
|
if (strcmp (serv->s_name, name) == 0)
|
|
{
|
|
if (strcmp (serv->s_proto, protocol) == 0)
|
|
{
|
|
found = 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
internal_nis_endservent (&data);
|
|
|
|
if (!found && status == NSS_STATUS_SUCCESS)
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
return status;
|
|
}
|
|
|
|
enum nss_status
|
|
_nss_nis_getservbyport_r (int port, char *protocol, struct servent *serv,
|
|
char *buffer, size_t buflen)
|
|
{
|
|
intern_t data = {TRUE, NULL, 0};
|
|
enum nss_status status;
|
|
int found;
|
|
|
|
if (protocol == NULL)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return NSS_STATUS_UNAVAIL;
|
|
}
|
|
|
|
status = internal_nis_setservent (&data);
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
return status;
|
|
|
|
found = 0;
|
|
while (!found &&
|
|
((status = internal_nis_getservent_r (serv, buffer, buflen, &data))
|
|
== NSS_STATUS_SUCCESS))
|
|
{
|
|
if (htons (serv->s_port) == port)
|
|
{
|
|
if (strcmp (serv->s_proto, protocol) == 0)
|
|
{
|
|
found = 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
internal_nis_endservent (&data);
|
|
|
|
if (!found && status == NSS_STATUS_SUCCESS)
|
|
return NSS_STATUS_NOTFOUND;
|
|
else
|
|
return status;
|
|
}
|