2001-04-26  Ulrich Drepper  <drepper@redhat.com>

	* nis/nss-nis.h: Move yperr2nss_tab definition into separate file
	and rename to __yperr2nss_tab.  Change YPERR_COUNT into variable
	__yperr2nss_count.
	* nis/nss-nis.c: New file.
	* nis/Makefile (libnss_compat-routines): Add nss-nis.
	(libnss_nis-routines): Likewise.

	* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Some more
	optimizations.  Patch by Jakub Jelinek <jakub@redhat.com>.
This commit is contained in:
Ulrich Drepper 2001-04-26 13:44:29 +00:00
parent 7cc7c0f7e7
commit 48a92e9d2d
4 changed files with 66 additions and 25 deletions

View File

@ -1,3 +1,15 @@
2001-04-26 Ulrich Drepper <drepper@redhat.com>
* nis/nss-nis.h: Move yperr2nss_tab definition into separate file
and rename to __yperr2nss_tab. Change YPERR_COUNT into variable
__yperr2nss_count.
* nis/nss-nis.c: New file.
* nis/Makefile (libnss_compat-routines): Add nss-nis.
(libnss_nis-routines): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Some more
optimizations. Patch by Jakub Jelinek <jakub@redhat.com>.
2001-04-26 Andreas Jaeger <aj@suse.de>
* po/zh_TW.po: Update.

View File

@ -55,10 +55,11 @@ libnsl-routines = yp_xdr ypclnt ypupdate_xdr \
nis_clone_res
libnss_compat-routines := $(addprefix compat-,grp pwd spwd initgroups) \
nisplus-parser
nisplus-parser nss-nis
libnss_compat-inhibit-o = $(filter-out .os,$(object-suffixes))
libnss_nis-routines := $(addprefix nis-,$(databases)) nis-initgroups
libnss_nis-routines := $(addprefix nis-,$(databases)) nis-initgroups \
nss-nis
libnss_nis-inhibit-o = $(filter-out .os,$(object-suffixes))
libnss_nisplus-routines := $(addprefix nisplus-,$(databases)) nisplus-parser

47
nis/nss-nis.c Normal file
View File

@ -0,0 +1,47 @@
/* Copyright (C) 1996, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
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 <rpcsvc/ypclnt.h>
#include "nss-nis.h"
#include "nsswitch.h"
/* Convert YP error number to NSS error number. */
const enum nss_status __yperr2nss_tab[] =
{
[YPERR_SUCCESS] = NSS_STATUS_SUCCESS,
[YPERR_BADARGS] = NSS_STATUS_UNAVAIL,
[YPERR_RPC] = NSS_STATUS_UNAVAIL,
[YPERR_DOMAIN] = NSS_STATUS_UNAVAIL,
[YPERR_MAP] = NSS_STATUS_UNAVAIL,
[YPERR_KEY] = NSS_STATUS_NOTFOUND,
[YPERR_YPERR] = NSS_STATUS_UNAVAIL,
[YPERR_RESRC] = NSS_STATUS_TRYAGAIN,
[YPERR_NOMORE] = NSS_STATUS_NOTFOUND,
[YPERR_PMAP] = NSS_STATUS_UNAVAIL,
[YPERR_YPBIND] = NSS_STATUS_UNAVAIL,
[YPERR_YPSERV] = NSS_STATUS_UNAVAIL,
[YPERR_NODOM] = NSS_STATUS_UNAVAIL,
[YPERR_BADDB] = NSS_STATUS_UNAVAIL,
[YPERR_VERS] = NSS_STATUS_UNAVAIL,
[YPERR_ACCESS] = NSS_STATUS_UNAVAIL,
[YPERR_BUSY] = NSS_STATUS_TRYAGAIN
};
const unsigned int __yperr2nss_count = (sizeof (__yperr2nss_tab)
/ sizeof (__yperr2nss_tab[0]));

View File

@ -25,34 +25,15 @@
/* Convert YP error number to NSS error number. */
static enum nss_status yperr2nss_tab[] =
{
[YPERR_SUCCESS] = NSS_STATUS_SUCCESS,
[YPERR_BADARGS] = NSS_STATUS_UNAVAIL,
[YPERR_RPC] = NSS_STATUS_UNAVAIL,
[YPERR_DOMAIN] = NSS_STATUS_UNAVAIL,
[YPERR_MAP] = NSS_STATUS_UNAVAIL,
[YPERR_KEY] = NSS_STATUS_NOTFOUND,
[YPERR_YPERR] = NSS_STATUS_UNAVAIL,
[YPERR_RESRC] = NSS_STATUS_TRYAGAIN,
[YPERR_NOMORE] = NSS_STATUS_NOTFOUND,
[YPERR_PMAP] = NSS_STATUS_UNAVAIL,
[YPERR_YPBIND] = NSS_STATUS_UNAVAIL,
[YPERR_YPSERV] = NSS_STATUS_UNAVAIL,
[YPERR_NODOM] = NSS_STATUS_UNAVAIL,
[YPERR_BADDB] = NSS_STATUS_UNAVAIL,
[YPERR_VERS] = NSS_STATUS_UNAVAIL,
[YPERR_ACCESS] = NSS_STATUS_UNAVAIL,
[YPERR_BUSY] = NSS_STATUS_TRYAGAIN
};
#define YPERR_COUNT (sizeof (yperr2nss_tab) / sizeof (yperr2nss_tab[0]))
extern const enum nss_status __yperr2nss_tab[];
extern const unsigned int __yperr2nss_count;
static inline enum nss_status
yperr2nss (int errval)
{
if ((unsigned int) errval > YPERR_COUNT)
if ((unsigned int) errval > __yperr2nss_count)
return NSS_STATUS_UNAVAIL;
return yperr2nss_tab[errval];
return __yperr2nss_tab[errval];
}
#endif /* nis/nss-nis.h */