summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2002-09-03 21:38:03 +0000
committerKen Raeburn <raeburn@mit.edu>2002-09-03 21:38:03 +0000
commitba128d957e26b51049b75f4c30dfc78308491e7e (patch)
tree56ecb15aba594aa7b6d4b78bc26539bcbcec35db /src
parent55662e97859d83cdaa672b244d8bd12fa35cffac (diff)
downloadkrb5-ba128d957e26b51049b75f4c30dfc78308491e7e.tar.gz
krb5-ba128d957e26b51049b75f4c30dfc78308491e7e.tar.xz
krb5-ba128d957e26b51049b75f4c30dfc78308491e7e.zip
revert init change to flock_zero in krb5_lock_file
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14819 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/krb5/os/ChangeLog1
-rw-r--r--src/lib/krb5/os/lock_file.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 02952e965..32ddaef68 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -14,7 +14,6 @@
* c_ustime.c, timeofday.c: Don't declare errno.
* hst_realm.c (krb5_try_realm_txt_rr), locate_kdc.c
(krb5_locate_srv_dns_1): Avoid variable name "class".
- * lock_file.c (krb5_lock_file): Initialize flock_zero.
* sendto_kdc.c (enum conn_states): Define separately from
conn_state 'state' field declaration.
diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index 32155c47f..48af525d6 100644
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -68,7 +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 = { 0 };
+ static const struct flock flock_zero;
struct flock lock_arg;
lock_arg = flock_zero;