Skip to content

Commit

Permalink
[BZ #3195]
Browse files Browse the repository at this point in the history
	* nscd/nscd_getai.c (__nscd_getai): Set errno to 0 in case we found
	no entry.
	* nscd/nscd_getgr.c (nscd_getgr_r): Likewise.
	* nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise.
	* nscd/nscd_getpw_r.c (nscd_getpw_r): Likewise.
	* nscd/nscd_getserv_r.c (nscd_getserv_r): Likewise.
  • Loading branch information
Ulrich Drepper committed Oct 13, 2007
1 parent 43d3e6b commit cfca0aa
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 11 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
2007-10-13 Ulrich Drepper <drepper@redhat.com>

[BZ #3195]
* nscd/nscd_getai.c (__nscd_getai): Set errno to 0 in case we found
no entry.
* nscd/nscd_getgr.c (nscd_getgr_r): Likewise.
* nscd/nscd_gethst_r.c (nscd_gethst_r): Likewise.
* nscd/nscd_getpw_r.c (nscd_getpw_r): Likewise.
* nscd/nscd_getserv_r.c (nscd_getserv_r): Likewise.

* nscd/nscd_getgr_r.c (nscd_getgr_r): Optimize a bit: use simpler
read mechanism when there are no group members and avoid no-op
read syscall in this case.
Expand Down
4 changes: 2 additions & 2 deletions nscd/nscd_getai.c
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ __nscd_getai (const char *key, struct nscd_ai_result **result, int *h_errnop)
/* Store the error number. */
*h_errnop = ai_resp.error;

/* The `errno' to some value != ERANGE. */
__set_errno (ENOENT);
/* Set errno to 0 to indicate no error, just no found record. */
__set_errno (0);
/* Even though we have not found anything, the result is zero. */
retval = 0;
}
Expand Down
4 changes: 2 additions & 2 deletions nscd/nscd_getgr_r.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ nscd_getgr_r (const char *key, size_t keylen, request_type type,
}
else
{
/* The `errno' to some value != ERANGE. */
__set_errno (ENOENT);
/* Set errno to 0 to indicate no error, just no found record. */
__set_errno (0);
/* Even though we have not found anything, the result is zero. */
retval = 0;
}
Expand Down
4 changes: 2 additions & 2 deletions nscd/nscd_gethst_r.c
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,8 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
/* Store the error number. */
*h_errnop = hst_resp.error;

/* The `errno' to some value != ERANGE. */
__set_errno (ENOENT);
/* Set errno to 0 to indicate no error, just no found record. */
__set_errno (0);
/* Even though we have not found anything, the result is zero. */
retval = 0;
}
Expand Down
4 changes: 2 additions & 2 deletions nscd/nscd_getpw_r.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type,
}
else
{
/* The `errno' to some value != ERANGE. */
__set_errno (ENOENT);
/* Set errno to 0 to indicate no error, just no found record. */
__set_errno (0);
/* Even though we have not found anything, the result is zero. */
retval = 0;
}
Expand Down
4 changes: 2 additions & 2 deletions nscd/nscd_getserv_r.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto,
}
else
{
/* The `errno' to some value != ERANGE. */
__set_errno (ENOENT);
/* Set errno to 0 to indicate no error, just no found record. */
__set_errno (0);
/* Even though we have not found anything, the result is zero. */
retval = 0;
}
Expand Down
2 changes: 1 addition & 1 deletion nscd/nscd_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@


/* Extra time we wait if the socket is still receiving data. This
value is in microseconds. Note that the other side is nscd on the
value is in milliseconds. Note that the other side is nscd on the
local machine and it is already transmitting data. So the wait
time need not be long. */
#define EXTRA_RECEIVE_TIME 200
Expand Down

0 comments on commit cfca0aa

Please sign in to comment.