sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

Make map_errno_from_nt_status() a generic call, not just a cli specific one.

Browse Source 
Remove some unused calls from vfs_acl_xattr. Test for SD's on existing files.
Jeremy.
This commit is contained in:
Jeremy Allison
2008-10-07 14:43:42 -07:00
parent abf00f710d
commit 2024d87cf5
4 changed files with 175 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
source3/libsmb/clierror.c
View File

@ -236,142 +236,6 @@ void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
*ecode = SVAL(cli->inbuf,smb_err);
}
/* Return a UNIX errno from a NT status code */
static const struct {
NTSTATUS status;
int error;
} nt_errno_map[] = {
{NT_STATUS_ACCESS_VIOLATION, EACCES},
{NT_STATUS_INVALID_HANDLE, EBADF},
{NT_STATUS_ACCESS_DENIED, EACCES},
{NT_STATUS_OBJECT_NAME_NOT_FOUND, ENOENT},
{NT_STATUS_OBJECT_PATH_NOT_FOUND, ENOENT},
{NT_STATUS_SHARING_VIOLATION, EBUSY},
{NT_STATUS_OBJECT_PATH_INVALID, ENOTDIR},
{NT_STATUS_OBJECT_NAME_COLLISION, EEXIST},
{NT_STATUS_PATH_NOT_COVERED, ENOENT},
{NT_STATUS_UNSUCCESSFUL, EINVAL},
{NT_STATUS_NOT_IMPLEMENTED, ENOSYS},
{NT_STATUS_IN_PAGE_ERROR, EFAULT},
{NT_STATUS_BAD_NETWORK_NAME, ENOENT},
#ifdef EDQUOT
{NT_STATUS_PAGEFILE_QUOTA, EDQUOT},
{NT_STATUS_QUOTA_EXCEEDED, EDQUOT},
{NT_STATUS_REGISTRY_QUOTA_LIMIT, EDQUOT},
{NT_STATUS_LICENSE_QUOTA_EXCEEDED, EDQUOT},
#endif
#ifdef ETIME
{NT_STATUS_TIMER_NOT_CANCELED, ETIME},
#endif
{NT_STATUS_INVALID_PARAMETER, EINVAL},
{NT_STATUS_NO_SUCH_DEVICE, ENODEV},
{NT_STATUS_NO_SUCH_FILE, ENOENT},
#ifdef ENODATA
{NT_STATUS_END_OF_FILE, ENODATA},
#endif
#ifdef ENOMEDIUM
{NT_STATUS_NO_MEDIA_IN_DEVICE, ENOMEDIUM},
{NT_STATUS_NO_MEDIA, ENOMEDIUM},
#endif
{NT_STATUS_NONEXISTENT_SECTOR, ESPIPE},
{NT_STATUS_NO_MEMORY, ENOMEM},
{NT_STATUS_CONFLICTING_ADDRESSES, EADDRINUSE},
{NT_STATUS_NOT_MAPPED_VIEW, EINVAL},
{NT_STATUS_UNABLE_TO_FREE_VM, EADDRINUSE},
{NT_STATUS_ACCESS_DENIED, EACCES},
{NT_STATUS_BUFFER_TOO_SMALL, ENOBUFS},
{NT_STATUS_WRONG_PASSWORD, EACCES},
{NT_STATUS_LOGON_FAILURE, EACCES},
{NT_STATUS_INVALID_WORKSTATION, EACCES},
{NT_STATUS_INVALID_LOGON_HOURS, EACCES},
{NT_STATUS_PASSWORD_EXPIRED, EACCES},
{NT_STATUS_ACCOUNT_DISABLED, EACCES},
{NT_STATUS_DISK_FULL, ENOSPC},
{NT_STATUS_INVALID_PIPE_STATE, EPIPE},
{NT_STATUS_PIPE_BUSY, EPIPE},
{NT_STATUS_PIPE_DISCONNECTED, EPIPE},
{NT_STATUS_PIPE_NOT_AVAILABLE, ENOSYS},
{NT_STATUS_FILE_IS_A_DIRECTORY, EISDIR},
{NT_STATUS_NOT_SUPPORTED, ENOSYS},
{NT_STATUS_NOT_A_DIRECTORY, ENOTDIR},
{NT_STATUS_DIRECTORY_NOT_EMPTY, ENOTEMPTY},
{NT_STATUS_NETWORK_UNREACHABLE, ENETUNREACH},
{NT_STATUS_HOST_UNREACHABLE, EHOSTUNREACH},
{NT_STATUS_CONNECTION_ABORTED, ECONNABORTED},
{NT_STATUS_CONNECTION_REFUSED, ECONNREFUSED},
{NT_STATUS_TOO_MANY_LINKS, EMLINK},
{NT_STATUS_NETWORK_BUSY, EBUSY},
{NT_STATUS_DEVICE_DOES_NOT_EXIST, ENODEV},
#ifdef ELIBACC
{NT_STATUS_DLL_NOT_FOUND, ELIBACC},
#endif
{NT_STATUS_PIPE_BROKEN, EPIPE},
{NT_STATUS_REMOTE_NOT_LISTENING, ECONNREFUSED},
{NT_STATUS_NETWORK_ACCESS_DENIED, EACCES},
{NT_STATUS_TOO_MANY_OPENED_FILES, EMFILE},
#ifdef EPROTO
{NT_STATUS_DEVICE_PROTOCOL_ERROR, EPROTO},
#endif
{NT_STATUS_FLOAT_OVERFLOW, ERANGE},
{NT_STATUS_FLOAT_UNDERFLOW, ERANGE},
{NT_STATUS_INTEGER_OVERFLOW, ERANGE},
{NT_STATUS_MEDIA_WRITE_PROTECTED, EROFS},
{NT_STATUS_PIPE_CONNECTED, EISCONN},
{NT_STATUS_MEMORY_NOT_ALLOCATED, EFAULT},
{NT_STATUS_FLOAT_INEXACT_RESULT, ERANGE},
{NT_STATUS_ILL_FORMED_PASSWORD, EACCES},
{NT_STATUS_PASSWORD_RESTRICTION, EACCES},
{NT_STATUS_ACCOUNT_RESTRICTION, EACCES},
{NT_STATUS_PORT_CONNECTION_REFUSED, ECONNREFUSED},
{NT_STATUS_NAME_TOO_LONG, ENAMETOOLONG},
{NT_STATUS_REMOTE_DISCONNECT, ESHUTDOWN},
{NT_STATUS_CONNECTION_DISCONNECTED, ECONNABORTED},
{NT_STATUS_CONNECTION_RESET, ENETRESET},
#ifdef ENOTUNIQ
{NT_STATUS_IP_ADDRESS_CONFLICT1, ENOTUNIQ},
{NT_STATUS_IP_ADDRESS_CONFLICT2, ENOTUNIQ},
#endif
{NT_STATUS_PORT_MESSAGE_TOO_LONG, EMSGSIZE},
{NT_STATUS_PROTOCOL_UNREACHABLE, ENOPROTOOPT},
{NT_STATUS_ADDRESS_ALREADY_EXISTS, EADDRINUSE},
{NT_STATUS_PORT_UNREACHABLE, EHOSTUNREACH},
{NT_STATUS_IO_TIMEOUT, ETIMEDOUT},
{NT_STATUS_RETRY, EAGAIN},
#ifdef ENOTUNIQ
{NT_STATUS_DUPLICATE_NAME, ENOTUNIQ},
#endif
#ifdef ECOMM
{NT_STATUS_NET_WRITE_FAULT, ECOMM},
#endif
#ifdef EXDEV
{NT_STATUS_NOT_SAME_DEVICE, EXDEV},
#endif
{NT_STATUS(0), 0}
};
/****************************************************************************
The following mappings need tidying up and moving into libsmb/errormap.c...
****************************************************************************/
static int cli_errno_from_nt(NTSTATUS status)
{
int i;
DEBUG(10,("cli_errno_from_nt: 32 bit codes: code=%08x\n", NT_STATUS_V(status)));
/* Status codes without this bit set are not errors */
if (!(NT_STATUS_V(status) & 0xc0000000)) {
return 0;
}
for (i=0;nt_errno_map[i].error;i++) {
if (NT_STATUS_V(nt_errno_map[i].status) ==
NT_STATUS_V(status)) return nt_errno_map[i].error;
}
/* for all other cases - a default code */
return EINVAL;
}
/* Return a UNIX errno appropriate for the error received in the last
packet. */
@ -382,7 +246,7 @@ int cli_errno(struct cli_state *cli)
if (cli_is_nt_error(cli)) {
status = cli_nt_error(cli);
return cli_errno_from_nt(status);
return map_errno_from_nt_status(status);
}
if (cli_is_dos_error(cli)) {
@ -391,7 +255,7 @@ int cli_errno(struct cli_state *cli)
cli_dos_error(cli, &eclass, &ecode);
status = dos_to_ntstatus(eclass, ecode);
return cli_errno_from_nt(status);
return map_errno_from_nt_status(status);
}
/*