sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r25917: ndr: move ndr_map_error2ntstatus to errormap.c

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2007-11-09 19:23:57 +01:00
parent 7e157bbcfd
commit 8fc2e7737f
3 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/libcli/util/error.h
View File

@ -22,6 +22,7 @@
#include "libcli/util/werror.h"
#include "libcli/util/doserr.h"
#include "libcli/util/ntstatus.h"
#include "librpc/ndr/libndr.h"
/** NT error on DOS connection! (NT_STATUS_OK) */
bool ntstatus_dos_equal(NTSTATUS status1, NTSTATUS status2);
@ -46,6 +47,9 @@ WERROR ntstatus_to_werror(NTSTATUS error);
*********************************************************************/
NTSTATUS map_nt_error_from_unix(int unix_error);
/*********************************************************************
Map an NT error code from a NDR error code.
*********************************************************************/
NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err);
#endif /* _SAMBA_ERROR_H */

25
source/libcli/util/errormap.c
View File

@ -1375,3 +1375,28 @@ NTSTATUS map_nt_error_from_unix(int unix_error)
/* Default return */
return NT_STATUS_UNSUCCESSFUL;
}
NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err)
{
switch (ndr_err) {
case NDR_ERR_SUCCESS:
return NT_STATUS_OK;
case NDR_ERR_BUFSIZE:
return NT_STATUS_BUFFER_TOO_SMALL;
case NDR_ERR_TOKEN:
return NT_STATUS_INTERNAL_ERROR;
case NDR_ERR_ALLOC:
return NT_STATUS_NO_MEMORY;
case NDR_ERR_ARRAY_SIZE:
return NT_STATUS_ARRAY_BOUNDS_EXCEEDED;
case NDR_ERR_INVALID_POINTER:
return NT_STATUS_INVALID_PARAMETER_MIX;
case NDR_ERR_UNREAD_BYTES:
return NT_STATUS_PORT_MESSAGE_TOO_LONG;
default:
break;
}
/* we should map all error codes to different status codes */
return NT_STATUS_INVALID_PARAMETER;
}

25
source/librpc/ndr/ndr.c
View File

@ -353,31 +353,6 @@ _PUBLIC_ void ndr_set_flags(uint32_t *pflags, uint32_t new_flags)
(*pflags) |= new_flags;
}
NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err)
{
switch (ndr_err) {
case NDR_ERR_SUCCESS:
return NT_STATUS_OK;
case NDR_ERR_BUFSIZE:
return NT_STATUS_BUFFER_TOO_SMALL;
case NDR_ERR_TOKEN:
return NT_STATUS_INTERNAL_ERROR;
case NDR_ERR_ALLOC:
return NT_STATUS_NO_MEMORY;
case NDR_ERR_ARRAY_SIZE:
return NT_STATUS_ARRAY_BOUNDS_EXCEEDED;
case NDR_ERR_INVALID_POINTER:
return NT_STATUS_INVALID_PARAMETER_MIX;
case NDR_ERR_UNREAD_BYTES:
return NT_STATUS_PORT_MESSAGE_TOO_LONG;
default:
break;
}
/* we should map all error codes to different status codes */
return NT_STATUS_INVALID_PARAMETER;
}
/*
return and possibly log an NDR error
*/