summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2004-03-06 00:54:48 +0000
committerKen Raeburn <raeburn@mit.edu>2004-03-06 00:54:48 +0000
commitc3a95ecb7aef27aff034f3a2b0bf1d145feece9a (patch)
treed7ab0d72faca2c5005a6b90b61c5cef45335036f
parent3ccc6f691d07635a465d927cbb723275d813fd9c (diff)
downloadkrb5-c3a95ecb7aef27aff034f3a2b0bf1d145feece9a.tar.gz
krb5-c3a95ecb7aef27aff034f3a2b0bf1d145feece9a.tar.xz
krb5-c3a95ecb7aef27aff034f3a2b0bf1d145feece9a.zip
* lock_file.c (krb5_lock_file): Initialize flock data on entry, but don't
bother with a static version to copy from. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16150 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/krb5/os/ChangeLog5
-rw-r--r--src/lib/krb5/os/lock_file.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 90fe4df27d..e581ef4401 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-05 Ken Raeburn <raeburn@mit.edu>
+
+ * lock_file.c (krb5_lock_file): Initialize flock data on entry,
+ but don't bother with a static version to copy from.
+
2004-02-26 Jeffrey Altman <jaltman@mit.edu>
* sendto_kdc.c, send524.c:
diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index 48af525d65..3c07d8d635 100644
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -68,10 +68,7 @@ krb5_lock_file(krb5_context context, int fd, int mode)
krb5_error_code retval = 0;
#ifdef POSIX_FILE_LOCKS
int lock_cmd = F_SETLKW;
- static const struct flock flock_zero;
- struct flock lock_arg;
-
- lock_arg = flock_zero;
+ struct flock lock_arg = { 0 };
#endif
switch (mode & ~KRB5_LOCKMODE_DONTBLOCK) {