diff options
Diffstat (limited to 'hesiod')
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-grp.c | 12 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-proto.c | 15 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-pwd.c | 12 | ||||
| -rw-r--r-- | hesiod/nss_hesiod/hesiod-service.c | 15 |
4 files changed, 42 insertions, 12 deletions
diff --git a/hesiod/nss_hesiod/hesiod-grp.c b/hesiod/nss_hesiod/hesiod-grp.c index fdaf1f26f7..50c53f7893 100644 --- a/hesiod/nss_hesiod/hesiod-grp.c +++ b/hesiod/nss_hesiod/hesiod-grp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -57,6 +57,7 @@ lookup (const char *name, const char *type, struct group *grp, char **list; int parse_res; size_t len; + int olderr = errno; context = _nss_hesiod_init (); if (context == NULL) @@ -65,8 +66,10 @@ lookup (const char *name, const char *type, struct group *grp, list = hesiod_resolve (context, name, type); if (list == NULL) { + int err = errno; hesiod_end (context); - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + __set_errno (olderr); + return err == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; } linebuflen = buffer + buflen - data->linebuffer; @@ -85,7 +88,10 @@ lookup (const char *name, const char *type, struct group *grp, parse_res = _nss_files_parse_grent (buffer, grp, data, buflen, errnop); if (parse_res < 1) - return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; + { + __set_errno (olderr); + return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; + } return NSS_STATUS_SUCCESS; } diff --git a/hesiod/nss_hesiod/hesiod-proto.c b/hesiod/nss_hesiod/hesiod-proto.c index 333f02a5f5..137b57202b 100644 --- a/hesiod/nss_hesiod/hesiod-proto.c +++ b/hesiod/nss_hesiod/hesiod-proto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -67,6 +67,7 @@ lookup (const char *name, const char *type, struct protoent *proto, char **list, **item; int parse_res; int found; + int olderr = errno; context = _nss_hesiod_init (); if (context == NULL) @@ -75,8 +76,10 @@ lookup (const char *name, const char *type, struct protoent *proto, list = hesiod_resolve (context, name, type); if (list == NULL) { + int err = errno; hesiod_end (context); - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + __set_errno (olderr); + return err == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; } linebuflen = buffer + buflen - data->linebuffer; @@ -115,7 +118,13 @@ lookup (const char *name, const char *type, struct protoent *proto, hesiod_free_list (context, list); hesiod_end (context); - return found ? NSS_STATUS_SUCCESS : NSS_STATUS_NOTFOUND; + if (found == 0) + { + __set_errno (olderr); + return NSS_STATUS_NOTFOUND; + } + + return NSS_STATUS_SUCCESS; } enum nss_status diff --git a/hesiod/nss_hesiod/hesiod-pwd.c b/hesiod/nss_hesiod/hesiod-pwd.c index 9f57e27906..2a7f65e2f0 100644 --- a/hesiod/nss_hesiod/hesiod-pwd.c +++ b/hesiod/nss_hesiod/hesiod-pwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -55,6 +55,7 @@ lookup (const char *name, const char *type, struct passwd *pwd, char **list; int parse_res; size_t len; + int olderr = errno; context = _nss_hesiod_init (); if (context == NULL) @@ -63,8 +64,10 @@ lookup (const char *name, const char *type, struct passwd *pwd, list = hesiod_resolve (context, name, type); if (list == NULL) { + int err = errno; hesiod_end (context); - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + __set_errno (olderr); + return err == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; } linebuflen = buffer + buflen - data->linebuffer; @@ -83,7 +86,10 @@ lookup (const char *name, const char *type, struct passwd *pwd, parse_res = _nss_files_parse_pwent (buffer, pwd, data, buflen, errnop); if (parse_res < 1) - return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; + { + __set_errno (olderr); + return parse_res == -1 ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; + } return NSS_STATUS_SUCCESS; } diff --git a/hesiod/nss_hesiod/hesiod-service.c b/hesiod/nss_hesiod/hesiod-service.c index bd4cb612fb..cb5edd2859 100644 --- a/hesiod/nss_hesiod/hesiod-service.c +++ b/hesiod/nss_hesiod/hesiod-service.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997. @@ -68,6 +68,7 @@ lookup (const char *name, const char *type, const char *protocol, char **list, **item; int parse_res; int found; + int olderr = errno; context = _nss_hesiod_init (); if (context == NULL) @@ -76,8 +77,10 @@ lookup (const char *name, const char *type, const char *protocol, list = hesiod_resolve (context, name, type); if (list == NULL) { + int err = errno; hesiod_end (context); - return errno == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; + __set_errno (olderr); + return err == ENOENT ? NSS_STATUS_NOTFOUND : NSS_STATUS_UNAVAIL; } linebuflen = buffer + buflen - data->linebuffer; @@ -116,7 +119,13 @@ lookup (const char *name, const char *type, const char *protocol, hesiod_free_list (context, list); hesiod_end (context); - return found ? NSS_STATUS_SUCCESS : NSS_STATUS_NOTFOUND; + if (found == 0) + { + __set_errno (olderr); + return NSS_STATUS_NOTFOUND; + } + + return NSS_STATUS_SUCCESS; } enum nss_status |