d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use flopen(3) instead of open(2) + flock(2)

Browse Source
This commit is contained in:
Baptiste Daroussin 2012-12-27 14:09:50 +00:00
parent a68c6b5790
commit 98e79fb122
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libutil/gr_util.c
View File

@ -106,10 +106,8 @@ gr_lock(void)
for (;;) {
struct stat st;
lockfd = open(group_file, O_RDONLY, 0);
if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
err(1, "%s", group_file);
if (flock(lockfd, LOCK_EX|LOCK_NB) == -1) {
lockfd = flopen(group_file, O_RDONLY|O_NONBLOCK, 0);
if (lockfd == -1) {
if (errno == EWOULDBLOCK) {
errx(1, "the group file is busy");
} else {

7
lib/libutil/pw_util.c
View File

@ -179,11 +179,8 @@ pw_lock(void)
for (;;) {
struct stat st;
lockfd = open(masterpasswd, O_RDONLY, 0);
if (lockfd < 0 || fcntl(lockfd, F_SETFD, 1) == -1)
err(1, "%s", masterpasswd);
/* XXX vulnerable to race conditions */
if (flock(lockfd, LOCK_EX|LOCK_NB) == -1) {
lockfd = flopen(masterpasswd, O_RDONLY|O_NONBLOCK, 0);
if (lockfd == -1) {
if (errno == EWOULDBLOCK) {
errx(1, "the password db file is busy");
} else {