sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

Must check against -1 for fcntl error check.

Browse Source 
Jeremy
(This used to be commit 1d2504b5c76bf23ac49a401adce8a49f193bc22c)
This commit is contained in:
Jeremy Allison 2001-12-13 02:34:43 +00:00
parent 23b239625c
commit e0d3a9e443
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/tdb/tdb.c
View File

@ -175,10 +175,10 @@ static int tdb_brlock(TDB_CONTEXT *tdb, tdb_off offset,
fl.l_len = 1; fl.l_len = 1;
fl.l_pid = 0; fl.l_pid = 0;
if (fcntl(tdb->fd,lck_type,&fl)) { if (fcntl(tdb->fd,lck_type,&fl) == -1) {
if (!probe) { if (!probe) {
TDB_LOG((tdb, 5,"tdb_brlock failed at offset %d rw_type=%d lck_type=%d\n", TDB_LOG((tdb, 5,"tdb_brlock failed (fd=%d) at offset %d rw_type=%d lck_type=%d\n",
offset, rw_type, lck_type)); tdb->fd, offset, rw_type, lck_type));
} }
/* errno set by fcntl */ /* errno set by fcntl */
return TDB_ERRCODE(TDB_ERR_LOCK, -1); return TDB_ERRCODE(TDB_ERR_LOCK, -1);
@ -202,7 +202,7 @@ static int tdb_lock(TDB_CONTEXT *tdb, int list, int ltype)
if (tdb->locked[list+1].count == 0) { if (tdb->locked[list+1].count == 0) {
if (!tdb->read_only && tdb->header.rwlocks) { if (!tdb->read_only && tdb->header.rwlocks) {
if (tdb_spinlock(tdb, list, ltype)) { if (tdb_spinlock(tdb, list, ltype)) {
TDB_LOG((tdb, 0, "tdb_lock spinlock on list ltype=%d\n", TDB_LOG((tdb, 0, "tdb_lock spinlock failed on list ltype=%d\n",
list, ltype)); list, ltype));
return -1; return -1;
} }