summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-12-02 13:34:59 +0100
committerVolker Lendecke <vl@sernet.de>2007-12-05 13:45:12 +0100
commitaa6f0a01513b91ead65069734a896eb9700b6c5b (patch)
tree09606ac3676e6a3578360937c4912b23286c6204 /source3/smbd
parent72ca4a68de371baabf36d90179f5bc442d146057 (diff)
downloadsamba-aa6f0a01513b91ead65069734a896eb9700b6c5b.tar.gz
samba-aa6f0a01513b91ead65069734a896eb9700b6c5b.tar.bz2
samba-aa6f0a01513b91ead65069734a896eb9700b6c5b.zip
Fix error returns
(This used to be commit f5cdaacd1784d3801d638fa9984b52c57dad6ebd)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/nttrans.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index c9bc3f45a0..739bf01ef9 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -992,7 +992,12 @@ void reply_ntcreate_and_X(connection_struct *conn, struct smb_request *req)
END_PROFILE(SMBntcreateX);
return;
}
- reply_nterror(req, status);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
+ reply_botherror(req, status, ERRDOS, ERRfilexists);
+ }
+ else {
+ reply_nterror(req, status);
+ }
END_PROFILE(SMBntcreateX);
return;
}
@@ -1422,7 +1427,12 @@ static void call_nt_transact_create(connection_struct *conn,
/* We have re-scheduled this call, no error. */
return;
}
- reply_nterror(req, status);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
+ reply_botherror(req, status, ERRDOS, ERRfilexists);
+ }
+ else {
+ reply_nterror(req, status);
+ }
return;
}