summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-26 17:24:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:38:23 -0500
commit8f93665bb5db57e3725487373e68a476a8e31d6d (patch)
tree1920f0e72695e4cd36a1767b41fa31929eb79379 /source3/libsmb
parent2681f88fbc24fc000ca713d769a4fcfd412cce71 (diff)
downloadsamba-8f93665bb5db57e3725487373e68a476a8e31d6d.tar.gz
samba-8f93665bb5db57e3725487373e68a476a8e31d6d.tar.bz2
samba-8f93665bb5db57e3725487373e68a476a8e31d6d.zip
r17262: After messages from Metze and traces from Karolin Seeger,
turns out that EDQUOTA must map to NT_STATUS_DISK_FULL for Windows apps to work correctly. My mistake. Jeremy. (This used to be commit de1e3f7a7ae9e8a41b45130e2cdfc22f43cf53b5)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/errormap.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c
index a5e922fd5c..cb5e8311ca 100644
--- a/source3/libsmb/errormap.c
+++ b/source3/libsmb/errormap.c
@@ -779,11 +779,7 @@ static const struct {
{ERRHRD, ERRlock, NT_STATUS_FILE_LOCK_CONFLICT},
{ERRHRD, ERRwrongdisk, NT_STATUS_WRONG_VOLUME},
{ERRHRD, 38, NT_STATUS_END_OF_FILE},
-#if defined(WITH_QUOTAS) && defined(EDQUOT)
- {ERRHRD, ERRdiskfull, NT_STATUS_QUOTA_EXCEEDED},
-#else
{ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL},
-#endif
{ERRHRD, 50, NT_STATUS_CTL_FILE_NOT_SUPPORTED},
{ERRHRD, 51, NT_STATUS_REMOTE_NOT_LISTENING},
{ERRHRD, 52, NT_STATUS_DUPLICATE_NAME},
@@ -1526,7 +1522,7 @@ const struct unix_error_map unix_dos_nt_errmap[] = {
{ EISDIR, ERRDOS, ERRnoaccess, NT_STATUS_FILE_IS_A_DIRECTORY},
{ EMLINK, ERRDOS, ERRgeneral, NT_STATUS_TOO_MANY_LINKS },
#ifdef EDQUOT
- { EDQUOT, ERRHRD, ERRdiskfull, NT_STATUS_QUOTA_EXCEEDED },
+ { EDQUOT, ERRHRD, ERRdiskfull, NT_STATUS_DISK_FULL }, /* Windows apps need this, not NT_STATUS_QUOTA_EXCEEDED */
#endif
#ifdef ENOTEMPTY
{ ENOTEMPTY, ERRDOS, ERRnoaccess, NT_STATUS_DIRECTORY_NOT_EMPTY },