diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:49:30 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:49:30 +0000 |
| commit | e14d51045326808a48d43d7e0b45860cd33e2b17 (patch) | |
| tree | 90b47e500bf7b1ccffae92fc2105cea5b8b7b61f /nscd/nscd_getpw_r.c | |
| parent | c949e9c224c0fc890982cc42797ae868b04faa00 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/context_functions' into t/context_functions
Diffstat (limited to 'nscd/nscd_getpw_r.c')
| -rw-r--r-- | nscd/nscd_getpw_r.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nscd/nscd_getpw_r.c b/nscd/nscd_getpw_r.c index 59fbfee32c..285e331304 100644 --- a/nscd/nscd_getpw_r.c +++ b/nscd/nscd_getpw_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2016 Free Software Foundation, Inc. +/* Copyright (C) 1998-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@uni-paderborn.de>, 1998. @@ -38,8 +38,7 @@ int __nss_not_use_nscd_passwd; static int nscd_getpw_r (const char *key, size_t keylen, request_type type, struct passwd *resultbuf, char *buffer, - size_t buflen, struct passwd **result) - internal_function; + size_t buflen, struct passwd **result); int __nscd_getpwnam_r (const char *name, struct passwd *resultbuf, char *buffer, @@ -81,7 +80,6 @@ libc_freeres_fn (pw_map_free) static int -internal_function nscd_getpw_r (const char *key, size_t keylen, request_type type, struct passwd *resultbuf, char *buffer, size_t buflen, struct passwd **result) @@ -218,7 +216,7 @@ nscd_getpw_r (const char *key, size_t keylen, request_type type, out_close: if (sock != -1) - close_not_cancel_no_status (sock); + __close_nocancel_nostatus (sock); out: if (__nscd_drop_map_ref (mapped, &gc_cycle) != 0) { |