summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-10-21 18:39:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:01 -0500
commit5aafdee9062b529cca291f06857559994cae1ea2 (patch)
tree59bda93dee0e712a8a8e9bcee8d2ea8608a113e6 /source3
parent677c218f3f63565c5b3ca6b19db0aa900115c561 (diff)
downloadsamba-5aafdee9062b529cca291f06857559994cae1ea2.tar.gz
samba-5aafdee9062b529cca291f06857559994cae1ea2.tar.bz2
samba-5aafdee9062b529cca291f06857559994cae1ea2.zip
r3120: Fix bug #1955 reported by Love <lha@stacken.kth.se>. Inconsistent error return.
Jeremy. (This used to be commit c6b144654ae544c86f7caa35483e25f0cfe5e904)
Diffstat (limited to 'source3')
-rw-r--r--source3/locking/posix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 6173c80b2f..0e5edfa0eb 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -238,7 +238,7 @@ int fd_close_posix(struct connection_struct *conn, files_struct *fsp)
if (!add_fd_to_close_entry(fsp)) {
SAFE_FREE(entries);
- return False;
+ return -1;
}
SAFE_FREE(entries);
@@ -281,9 +281,9 @@ int fd_close_posix(struct connection_struct *conn, files_struct *fsp)
ret = SMB_VFS_CLOSE(fsp,fsp->fd);
if (saved_errno != 0) {
- errno = saved_errno;
+ errno = saved_errno;
ret = -1;
- }
+ }
fsp->fd = -1;