diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-11-17 22:46:04 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-11-17 22:46:04 +0000 |
| commit | 4761a27ab6af294d72f5aec07504880f769a1cf8 (patch) | |
| tree | 70aac4ababaf2af896dd0ea495b57698979a8c6c /lib/libutil | |
| parent | 1311c19cf53345ff599fa0f20166c365dd1eb8ce (diff) | |
Go back to old file locking method, O_EXLOCK method has too many problems
Diffstat (limited to 'lib/libutil')
| -rw-r--r-- | lib/libutil/passwd.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/libutil/passwd.c b/lib/libutil/passwd.c index b1128ae3994..d01a6245a23 100644 --- a/lib/libutil/passwd.c +++ b/lib/libutil/passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: passwd.c,v 1.14 1997/11/17 21:12:12 millert Exp $ */ +/* $OpenBSD: passwd.c,v 1.15 1997/11/17 22:46:03 millert Exp $ */ /* * Copyright (c) 1987, 1993, 1994, 1995 @@ -34,7 +34,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: passwd.c,v 1.14 1997/11/17 21:12:12 millert Exp $"; +static char rcsid[] = "$OpenBSD: passwd.c,v 1.15 1997/11/17 22:46:03 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -250,16 +250,13 @@ pw_lock(retries) if (!pw_lck) return (-1); - /* Acquire the lock file. */ + /* Acquire the lock file. */ old_mode = umask(0); - fd = open(pw_lck, O_WRONLY|O_CREAT|O_NONBLOCK|O_EXLOCK, 0600); - for (i = 0; i < retries && fd < 0 && errno == EAGAIN; i++) { + fd = open(pw_lck, O_WRONLY|O_CREAT|O_EXCL, 0600); + for (i = 0; i < retries && fd < 0 && errno == EEXIST; i++) { sleep(1); - fd = open(pw_lck, O_WRONLY|O_CREAT|O_NONBLOCK|O_EXLOCK, 0600); + fd = open(pw_lck, O_WRONLY|O_CREAT|O_EXCL, 0600); } - /* Really want to use O_TRUNC above but there is a bug in open(2) */ - if (fd != -1) - ftruncate(fd, 0); umask(old_mode); return (fd); } |