diff options
| author | dim <dim@FreeBSD.org> | 2015-02-10 07:56:14 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-10 07:56:14 +0000 |
| commit | 3b7b68ffe74f0538bae62b7a4ba4e448156b9542 (patch) | |
| tree | 44e5934692362d98f8d79d25ce9a540d067b87be /lib/libc | |
| parent | 0a0889c380877205a5983168ab5f2bdb044e18f4 (diff) | |
| parent | 49dd1c9d72146433c7c90f3546c426fd00316246 (diff) | |
| download | FreeBSD-src-3b7b68ffe74f0538bae62b7a4ba4e448156b9542.zip FreeBSD-src-3b7b68ffe74f0538bae62b7a4ba4e448156b9542.tar.gz | |
Merge ^/head r278351 through r278498.
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/gen/getgrent.c | 2 | ||||
| -rw-r--r-- | lib/libc/gen/getpwent.c | 2 | ||||
| -rw-r--r-- | lib/libc/sys/setresuid.2 | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c index f9480c3..caa5ad5 100644 --- a/lib/libc/gen/getgrent.c +++ b/lib/libc/gen/getgrent.c @@ -896,7 +896,7 @@ files_group(void *retval, void *mdata, va_list ap) break; pos = ftello(st->fp); } - if (!stayopen && st->fp != NULL) { + if (st->fp != NULL && !stayopen) { fclose(st->fp); st->fp = NULL; } diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c index f729cdf..7cf7f47 100644 --- a/lib/libc/gen/getpwent.c +++ b/lib/libc/gen/getpwent.c @@ -921,7 +921,7 @@ files_passwd(void *retval, void *mdata, va_list ap) errnop); } while (how == nss_lt_all && !(rv & NS_TERMINATE)); fin: - if (!stayopen && st->db != NULL) { + if (st->db != NULL && !stayopen) { (void)st->db->close(st->db); st->db = NULL; } diff --git a/lib/libc/sys/setresuid.2 b/lib/libc/sys/setresuid.2 index 08d07f3..602166f 100644 --- a/lib/libc/sys/setresuid.2 +++ b/lib/libc/sys/setresuid.2 @@ -19,7 +19,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 13, 2001 +.Dd February 7, 2015 .Dt SETRESUID 2 .Os .Sh NAME @@ -90,10 +90,5 @@ was invalid. .Xr setregid 2 , .Xr setreuid 2 , .Xr setuid 2 -.Sh STANDARDS -These system calls are not available on many platforms. -They exist in -.Fx -to support Linux binaries linked against GNU libc2. .Sh HISTORY These functions first appeared in HP-UX. |
