oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(_krb5_xunlock): catch the error and turn it into something sensable

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15325 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-05-31 21:48:57 +00:00
parent 2ed1ba03e7
commit 14747af538
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/krb5/fcache.c
View File

@@ -105,18 +105,33 @@ _krb5_xlock(krb5_context context, int fd, krb5_boolean exclusive,
} }
int int
_krb5_xunlock(int fd) _krb5_xunlock(krb5_context context, int fd)
{ {
int ret;
#ifdef HAVE_FCNTL_LOCK #ifdef HAVE_FCNTL_LOCK
struct flock l; struct flock l;
l.l_start = 0; l.l_start = 0;
l.l_len = 0; l.l_len = 0;
l.l_type = F_UNLCK; l.l_type = F_UNLCK;
l.l_whence = SEEK_SET; l.l_whence = SEEK_SET;
return fcntl(fd, F_SETLKW, &l); ret = fcntl(fd, F_SETLKW, &l);
#else #else
return flock(fd, LOCK_UN); ret = flock(fd, LOCK_UN);
#endif #endif
if (ret < 0)
ret = errno;
switch (ret) {
case 0:
break;
case EINVAL: /* filesystem doesn't support locking, let the user have it */
ret = 0;
break;
default:
krb5_set_error_string(context,
"Failed to unlock file: %s", strerror(ret));
break;
}
return ret;
} }
static krb5_error_code static krb5_error_code
@@ -129,7 +144,7 @@ fcc_lock(krb5_context context, krb5_ccache id,
static krb5_error_code static krb5_error_code
fcc_unlock(krb5_context context, int fd) fcc_unlock(krb5_context context, int fd)
{ {
return _krb5_xunlock(fd); return _krb5_xunlock(context, fd);
} }
static krb5_error_code static krb5_error_code