-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2015 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.
+ 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, see
+ <http://www.gnu.org/licenses/>. */
#include <nss.h>
#include <ctype.h>
__libc_lock_define_initialized (static, lock)
static bool_t new_start = 1;
-static char *oldkey = NULL;
-static int oldkeylen = 0;
+static char *oldkey;
+static int oldkeylen;
static int
_nss_nis_parse_aliasent (const char *key, char *alias, struct aliasent *result,
- char *buffer, size_t buflen)
+ char *buffer, size_t buflen, int *errnop)
{
char *first_unused = buffer + strlen (alias) + 1;
size_t room_left =
{
/* The line is too long for our buffer. */
no_more_room:
- __set_errno (ERANGE);
+ *errnop = ERANGE;
return -1;
}
return NSS_STATUS_SUCCESS;
}
-
-enum nss_status
-_nss_nis_endaliasent (void)
-{
- __libc_lock_lock (lock);
-
- new_start = 1;
- if (oldkey != NULL)
- {
- free (oldkey);
- oldkey = NULL;
- oldkeylen = 0;
- }
-
- __libc_lock_unlock (lock);
-
- return NSS_STATUS_SUCCESS;
-}
+/* The 'endaliasent' function is identical. */
+strong_alias (_nss_nis_setaliasent, _nss_nis_endaliasent)
static enum nss_status
internal_nis_getaliasent_r (struct aliasent *alias, char *buffer,
- size_t buflen)
+ size_t buflen, int *errnop)
{
char *domain;
- char *result;
- int len;
- char *outkey;
- int keylen;
- char *p;
- int parse_res;
- if (yp_get_default_domain (&domain))
+ if (__glibc_unlikely (yp_get_default_domain (&domain)))
return NSS_STATUS_UNAVAIL;
alias->alias_local = 0;
/* Get the next entry until we found a correct one. */
+ int parse_res;
do
{
- enum nss_status retval;
+ char *result;
+ int len;
+ char *outkey;
+ int keylen;
+ int yperr;
if (new_start)
- retval = yperr2nss (yp_first (domain, "mail.aliases",
- &outkey, &keylen, &result, &len));
+ yperr = yp_first (domain, "mail.aliases", &outkey, &keylen, &result,
+ &len);
else
- retval = yperr2nss ( yp_next (domain, "mail.aliases", oldkey,
- oldkeylen, &outkey, &keylen,
- &result, &len));
- if (retval != NSS_STATUS_SUCCESS)
+ yperr = yp_next (domain, "mail.aliases", oldkey, oldkeylen, &outkey,
+ &keylen, &result, &len);
+
+ if (__glibc_unlikely (yperr != YPERR_SUCCESS))
{
+ enum nss_status retval = yperr2nss (yperr);
+
if (retval == NSS_STATUS_TRYAGAIN)
- __set_errno (EAGAIN);
- return retval;
- }
+ *errnop = errno;
+ return retval;
+ }
- if ((size_t) (len + 1) > buflen)
- {
+ if (__glibc_unlikely ((size_t) (len + 1) > buflen))
+ {
free (result);
- __set_errno (ERANGE);
- return NSS_STATUS_TRYAGAIN;
- }
- p = strncpy (buffer, result, len);
+ *errnop = ERANGE;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ char *p = strncpy (buffer, result, len);
buffer[len] = '\0';
while (isspace (*p))
- ++p;
+ ++p;
free (result);
- if ((parse_res = _nss_nis_parse_aliasent (outkey, p, alias,
- buffer, buflen)) == -1)
+ parse_res = _nss_nis_parse_aliasent (outkey, p, alias, buffer,
+ buflen, errnop);
+ if (__glibc_unlikely (parse_res == -1))
{
free (outkey);
- __set_errno (ERANGE);
+ *errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
}
enum nss_status
-_nss_nis_getaliasent_r (struct aliasent *alias, char *buffer, size_t buflen)
+_nss_nis_getaliasent_r (struct aliasent *alias, char *buffer, size_t buflen,
+ int *errnop)
{
enum nss_status status;
__libc_lock_lock (lock);
- status = internal_nis_getaliasent_r (alias, buffer, buflen);
+ status = internal_nis_getaliasent_r (alias, buffer, buflen, errnop);
__libc_lock_unlock (lock);
enum nss_status
_nss_nis_getaliasbyname_r (const char *name, struct aliasent *alias,
- char *buffer, size_t buflen)
+ char *buffer, size_t buflen, int *errnop)
{
- enum nss_status retval;
- int parse_res;
- char *domain;
- char *result;
- int len;
- char *p;
-
if (name == NULL)
{
- __set_errno (EINVAL);
+ *errnop = EINVAL;
return NSS_STATUS_UNAVAIL;
}
- if (yp_get_default_domain (&domain))
+ char *domain;
+ if (__glibc_unlikely (yp_get_default_domain (&domain)))
return NSS_STATUS_UNAVAIL;
- retval = yperr2nss (yp_match (domain, "mail.aliases", name, strlen (name),
- &result, &len));
- if (retval != NSS_STATUS_SUCCESS)
+ size_t namlen = strlen (name);
+ char *name2;
+ int use_alloca = __libc_use_alloca (namlen + 1);
+ if (use_alloca)
+ name2 = __alloca (namlen + 1);
+ else
+ {
+ name2 = malloc (namlen + 1);
+ if (name2 == NULL)
+ {
+ *errnop = ENOMEM;
+ return NSS_STATUS_TRYAGAIN;
+ }
+ }
+
+ /* Convert name to lowercase. */
+ size_t i;
+ for (i = 0; i < namlen; ++i)
+ name2[i] = _tolower (name[i]);
+ name2[i] = '\0';
+
+ char *result;
+ int len;
+ int yperr = yp_match (domain, "mail.aliases", name2, namlen, &result, &len);
+
+ if (!use_alloca)
+ free (name2);
+
+ if (__glibc_unlikely (yperr != YPERR_SUCCESS))
{
+ enum nss_status retval = yperr2nss (yperr);
+
if (retval == NSS_STATUS_TRYAGAIN)
- __set_errno (EAGAIN);
+ *errnop = errno;
return retval;
}
- if ((size_t) (len + 1) > buflen)
+ if (__glibc_unlikely ((size_t) (len + 1) > buflen))
{
free (result);
- __set_errno (ERANGE);
+ *errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}
- p = strncpy (buffer, result, len);
+ char *p = strncpy (buffer, result, len);
buffer[len] = '\0';
while (isspace (*p))
++p;
free (result);
alias->alias_local = 0;
- if ((parse_res = _nss_nis_parse_aliasent (name, p, alias, buffer,
- buflen)) == -1)
- return NSS_STATUS_TRYAGAIN;
-
- if (parse_res)
- return NSS_STATUS_SUCCESS;
- else
- return NSS_STATUS_NOTFOUND;
+ int parse_res = _nss_nis_parse_aliasent (name, p, alias, buffer, buflen,
+ errnop);
+ if (__glibc_unlikely (parse_res < 1))
+ {
+ if (parse_res == -1)
+ return NSS_STATUS_TRYAGAIN;
+ else
+ return NSS_STATUS_NOTFOUND;
+ }
+
+ return NSS_STATUS_SUCCESS;
}
projects / thirdparty / glibc.git / blobdiff