sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-06 17:32:29 +03:00
Code Activity

I found lots of places where we assume error will be set when calling

Browse Source 
one of our virtualised functions, such as db_open(), but error is only
set when a system call fails, and it is not uncommon for us to fail a
function internally without ever making a system call. That led to us
passing back success when a function had in fact failed.

I found two places where we relied on map_nt_error_from_unix()
returning success when errno==0, but lots and lots of places where we
relied on the reverse, so I fixed those two places.

map_nt_error_from_unix() will now always return an error, returning
NT_STATUS_UNSUCCESSFUL if errno is 0
(cherry picked from commit 69d40ca4c1af925d4b0e59ddc69ef8c26e6501d1)
(This used to be commit 834684a524)
This commit is contained in:
Andrew Tridgell
2008-08-10 10:43:36 +10:00
committed by Michael Adam
parent 89dc729443
commit 8b25ce06ce
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source3/lib/errmap_unix.c
View File

@ -107,8 +107,16 @@ NTSTATUS map_nt_error_from_unix(int unix_error)
{
int i = 0;
if (unix_error == 0)
return NT_STATUS_OK;
if (unix_error == 0) {
/* we map this to an error, not success, as this
function is only called in an error path. Lots of
our virtualised functions may fail without making a
unix system call that fails (such as when they are
checking for some handle existing), so unix_error
may be unset
*/
return NT_STATUS_UNSUCCESSFUL;
}
/* Look through list */
while(unix_dos_nt_errmap[i].unix_error != 0) {

4
source3/smbd/reply.c
View File

@ -2527,7 +2527,7 @@ NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req,
TALLOC_FREE(dir_hnd);
}
if (count == 0 && NT_STATUS_IS_OK(status)) {
if (count == 0 && NT_STATUS_IS_OK(status) && errno != 0) {
status = map_nt_error_from_unix(errno);
}
@ -5910,7 +5910,7 @@ NTSTATUS rename_internals(TALLOC_CTX *ctx,
}
TALLOC_FREE(dir_hnd);
if (count == 0 && NT_STATUS_IS_OK(status)) {
if (count == 0 && NT_STATUS_IS_OK(status) && errno != 0) {
status = map_nt_error_from_unix(errno);
}