-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,2000,2001,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
+ Contributed by Thorsten Kukuk <kukuk@suse.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.
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 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.
+ Lesser 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. */
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; 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>
struct response *next;
};
-static struct response *start = NULL;
-static struct response *next = NULL;
+static struct response *start;
+static struct response *next;
static int
saveit (int instatus, char *inkey, int inkeylen, char *inval,
if (start == NULL)
{
start = malloc (sizeof (struct response));
+ if (start == NULL)
+ return YP_FALSE;
next = start;
}
else
{
next->next = malloc (sizeof (struct response));
+ if (next->next == NULL)
+ return YP_FALSE;
next = next->next;
}
next->next = NULL;
next->val = malloc (invallen + 1);
+ if (next->val == NULL)
+ return YP_FALSE;
strncpy (next->val, inval, invallen);
next->val[invallen] = '\0';
}
}
enum nss_status
-_nss_nis_setprotoent (void)
+_nss_nis_setprotoent (int stayopen)
{
enum nss_status status;
static enum nss_status
internal_nis_getprotoent_r (struct protoent *proto,
- char *buffer, size_t buflen)
+ char *buffer, size_t buflen, int *errnop)
{
struct parser_data *data = (void *) buffer;
int parse_res;
char *p;
if (next == NULL)
- return NSS_STATUS_NOTFOUND;
- p = strcpy (buffer, next->val);
- next = next->next;
+ return NSS_STATUS_NOTFOUND;
+
+ p = strncpy (buffer, next->val, buflen);
while (isspace (*p))
++p;
- parse_res = _nss_files_parse_protoent (p, proto, data, buflen);
- if (!parse_res && errno == ERANGE)
+ parse_res = _nss_files_parse_protoent (p, proto, data, buflen, errnop);
+ if (parse_res == -1)
return NSS_STATUS_TRYAGAIN;
+ next = next->next;
}
while (!parse_res);
}
enum nss_status
-_nss_nis_getprotoent_r (struct protoent *proto, char *buffer, size_t buflen)
+_nss_nis_getprotoent_r (struct protoent *proto, char *buffer, size_t buflen,
+ int *errnop)
{
enum nss_status status;
__libc_lock_lock (lock);
- status = internal_nis_getprotoent_r (proto, buffer, buflen);
+ status = internal_nis_getprotoent_r (proto, buffer, buflen, errnop);
__libc_lock_unlock (lock);
enum nss_status
_nss_nis_getprotobyname_r (const char *name, struct protoent *proto,
- char *buffer, size_t buflen)
+ char *buffer, size_t buflen, int *errnop)
{
struct parser_data *data = (void *) buffer;
enum nss_status retval;
if (name == NULL)
{
- __set_errno (EINVAL);
+ *errnop = EINVAL;
return NSS_STATUS_UNAVAIL;
}
if (retval != NSS_STATUS_SUCCESS)
{
if (retval == NSS_STATUS_TRYAGAIN)
- __set_errno (EAGAIN);
+ *errnop = errno;
return retval;
}
if ((size_t) (len + 1) > buflen)
{
free (result);
- __set_errno (ERANGE);
+ *errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
++p;
free (result);
- parse_res = _nss_files_parse_protoent (p, proto, data, buflen);
-
- if (!parse_res)
+ parse_res = _nss_files_parse_protoent (p, proto, data, buflen, errnop);
+ if (parse_res < 1)
{
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
+ if (parse_res == -1)
+ return NSS_STATUS_TRYAGAIN;
else
- return NSS_STATUS_NOTFOUND;
+ return NSS_STATUS_NOTFOUND;
}
- else
- return NSS_STATUS_SUCCESS;
+ return NSS_STATUS_SUCCESS;
}
enum nss_status
_nss_nis_getprotobynumber_r (int number, struct protoent *proto,
- char *buffer, size_t buflen)
+ char *buffer, size_t buflen, int *errnop)
{
struct parser_data *data = (void *) buffer;
enum nss_status retval;
if (retval != NSS_STATUS_SUCCESS)
{
if (retval == NSS_STATUS_TRYAGAIN)
- __set_errno (EAGAIN);
+ *errnop = errno;
return retval;
}
if ((size_t) (len + 1) > buflen)
{
free (result);
- __set_errno (ERANGE);
+ *errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
++p;
free (result);
- parse_res = _nss_files_parse_protoent (p, proto, data, buflen);
-
- if (!parse_res)
+ parse_res = _nss_files_parse_protoent (p, proto, data, buflen, errnop);
+ if (parse_res < 1)
{
- if (errno == ERANGE)
- return NSS_STATUS_TRYAGAIN;
+ if (parse_res == -1)
+ return NSS_STATUS_TRYAGAIN;
else
- return NSS_STATUS_NOTFOUND;
+ return NSS_STATUS_NOTFOUND;
}
- else
- return NSS_STATUS_SUCCESS;
+ return NSS_STATUS_SUCCESS;
}
projects / thirdparty / glibc.git / blobdiff