Update.

[thirdparty/glibc.git] / nis / nss_nis / nis-alias.c

diff --git a/nis/nss_nis/nis-alias.c b/nis/nss_nis/nis-alias.c
index 64d0bf8de536cee1a5f9deeece37f148c9a7f76b..2ceaa1da647a5db351e92a603f5392ff79b8b4c1 100644 (file)
--- a/nis/nss_nis/nis-alias.c
+++ b/nis/nss_nis/nis-alias.c
@@ -1,21 +1,21 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,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.
 
    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 <ctype.h>
@@ -31,8 +31,8 @@
 __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,
@@ -167,9 +167,7 @@ internal_nis_getaliasent_r (struct aliasent *alias, char *buffer,
                                      &result, &len));
       if (retval != NSS_STATUS_SUCCESS)
        {
-         if (retval == NSS_STATUS_NOTFOUND)
-           *errnop = ENOENT;
-         else if (retval == NSS_STATUS_TRYAGAIN)
+         if (retval == NSS_STATUS_TRYAGAIN)
             *errnop = errno;
           return retval;
         }