summaryrefslogtreecommitdiff
path: root/source3/libsmb/errormap.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-08-01 06:10:30 +0000
committerJeremy Allison <jra@samba.org>2003-08-01 06:10:30 +0000
commitef915c8eaf1d8335aa331d3b2376c40e3a63de22 (patch)
tree056d7a9b7f31b613fcd3c42e034f7b0758d8e0fa /source3/libsmb/errormap.c
parent7e39e87ce0a83a08a8bf2b27f7264bc3c12a9aee (diff)
downloadsamba-ef915c8eaf1d8335aa331d3b2376c40e3a63de22.tar.gz
samba-ef915c8eaf1d8335aa331d3b2376c40e3a63de22.tar.bz2
samba-ef915c8eaf1d8335aa331d3b2376c40e3a63de22.zip
Final fix for the bug tridge found. Only push locks onto a blocking lock
queue if the posix lock failed with EACCES or EAGAIN (this means another lock conflicts). Else return an error and don't queue the request. Jeremy. (This used to be commit 43fbc18fdc184bf29c15186c16bc99fb208de963)
Diffstat (limited to 'source3/libsmb/errormap.c')
-rw-r--r--source3/libsmb/errormap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c
index 8ee5ee3d31..3d99e3d5e5 100644
--- a/source3/libsmb/errormap.c
+++ b/source3/libsmb/errormap.c
@@ -1498,6 +1498,7 @@ const struct unix_error_map unix_dos_nt_errmap[] = {
{ ENFILE, ERRDOS, ERRnofids, NT_STATUS_TOO_MANY_OPENED_FILES },
{ EMFILE, ERRDOS, ERRnofids, NT_STATUS_TOO_MANY_OPENED_FILES },
{ ENOSPC, ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL },
+ { ENOMEM, ERRDOS, ERRnomem, NT_STATUS_NO_MEMORY },
#ifdef EDQUOT
{ EDQUOT, ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL },
#endif