aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-03-24 00:16:58 +0000
committerUlrich Drepper <drepper@redhat.com>2005-03-24 00:16:58 +0000
commit509230ca013deb00e0e3e22a3386e58b795f65d3 (patch)
tree40d675f49297b0f017c4327c2ddd6d79de22e824
parente77fa9189746631f1af281803206c07357679ec3 (diff)
downloadglibc-509230ca013deb00e0e3e22a3386e58b795f65d3.tar
glibc-509230ca013deb00e0e3e22a3386e58b795f65d3.tar.gz
glibc-509230ca013deb00e0e3e22a3386e58b795f65d3.tar.bz2
glibc-509230ca013deb00e0e3e22a3386e58b795f65d3.zip
(yp_2_yperr): Revert 2004-11-30 patch. (ypprot_err): Use yp_2_yperr table also for YP_NODOM .. YP_NOMORE.
-rw-r--r--nis/ypclnt.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index 85292b62d9..6230cb84dc 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2001, 2002, 2003, 2004, 2005
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@suse.de>, 1996.
@@ -829,6 +830,11 @@ yperr_string (const int error)
static const int8_t yp_2_yperr[] =
{
#define YP2YPERR(yp, yperr) [YP_##yp - YP_VERS] = YPERR_##yperr
+ YP2YPERR (TRUE, SUCCESS),
+ YP2YPERR (NOMORE, NOMORE),
+ YP2YPERR (FALSE, YPERR),
+ YP2YPERR (NOMAP, MAP),
+ YP2YPERR (NODOM, DOMAIN),
YP2YPERR (NOKEY, KEY),
YP2YPERR (BADOP, YPERR),
YP2YPERR (BADDB, BADDB),
@@ -839,7 +845,7 @@ static const int8_t yp_2_yperr[] =
int
ypprot_err (const int code)
{
- if (code < YP_VERS || code > YP_NOKEY)
+ if (code < YP_VERS || code > YP_NOMORE)
return YPERR_YPERR;
return yp_2_yperr[code - YP_VERS];
}