svn commit: r254222 - head/lib/libc/db/hash
Jilles Tjoelker
jilles at FreeBSD.org
Sun Aug 11 15:38:49 UTC 2013
Author: jilles
Date: Sun Aug 11 15:38:48 2013
New Revision: 254222
URL: http://svnweb.freebsd.org/changeset/base/254222
Log:
db/hash: Use O_CLOEXEC instead of separate fcntl() call.
In particular, a hash db is used by getpwnam() and getpwuid().
MFC after: 1 week
Modified:
head/lib/libc/db/hash/hash.c
Modified: head/lib/libc/db/hash/hash.c
==============================================================================
--- head/lib/libc/db/hash/hash.c Sun Aug 11 14:39:27 2013 (r254221)
+++ head/lib/libc/db/hash/hash.c Sun Aug 11 15:38:48 2013 (r254222)
@@ -121,9 +121,8 @@ __hash_open(const char *file, int flags,
hashp->flags = flags;
if (file) {
- if ((hashp->fp = _open(file, flags, mode)) == -1)
+ if ((hashp->fp = _open(file, flags | O_CLOEXEC, mode)) == -1)
RETURN_ERROR(errno, error0);
- (void)_fcntl(hashp->fp, F_SETFD, 1);
new_table = _fstat(hashp->fp, &statbuf) == 0 &&
statbuf.st_size == 0 && (flags & O_ACCMODE) != O_RDONLY;
} else
More information about the svn-src-head
mailing list