diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | nss/getXXbyYY_r.c | 18 |
2 files changed, 8 insertions, 11 deletions
@@ -41,6 +41,7 @@ The following bugs were resolved with this release: [33185] Fix double-free after allocation failure in regcomp [33234] Use TLS initial-exec model for __libc_tsd_CTYPE_* thread variables [33245] nptl: nptl: error in internal cancellation syscall handling + [33361] nss: Group merge does not react to ERANGE during merge Version 2.41 diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c index eae6c34..2b0735f 100644 --- a/nss/getXXbyYY_r.c +++ b/nss/getXXbyYY_r.c @@ -157,19 +157,15 @@ __merge_einval (LOOKUP_TYPE *a, #define CHECK_MERGE(err, status) \ ({ \ - do \ + if (err) \ { \ - if (err) \ - { \ - __set_errno (err); \ - if (err == ERANGE) \ - status = NSS_STATUS_TRYAGAIN; \ - else \ - status = NSS_STATUS_UNAVAIL; \ - break; \ - } \ + __set_errno (err); \ + if (err == ERANGE) \ + status = NSS_STATUS_TRYAGAIN; \ + else \ + status = NSS_STATUS_UNAVAIL; \ + break; \ } \ - while (0); \ }) /* Type of the lookup function we need here. */ |