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

r13669: Get rid of poor errno mapping table. Bounce through NTSTATUS instead.

Browse Source 
DO NOT MERGE FOR 3.0.21c PLEASE.
Jeremy.
(This used to be commit 3de0d9af69)
This commit is contained in:
Jeremy Allison 2006-02-24 05:47:19 +00:00 committed by Gerald (Jerry) Carter
parent ffba826a17
commit f690a968e7
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source3/libsmb/clierror.c
View File

@ -230,42 +230,6 @@ void cli_dos_error(struct cli_state *cli, uint8 *eclass, uint32 *ecode)
if (ecode) *ecode = code;
}
/****************************************************************************
The following mappings need tidying up and moving into libsmb/errormap.c...
****************************************************************************/
/* Return a UNIX errno from a dos error class, error number tuple */
static int cli_errno_from_dos(uint8 eclass, uint32 num)
{
if (eclass == ERRDOS) {
switch (num) {
case ERRbadfile: return ENOENT;
case ERRbadpath: return ENOTDIR;
case ERRnoaccess: return EACCES;
case ERRfilexists: return EEXIST;
case ERRrename: return EEXIST;
case ERRbadshare: return EBUSY;
case ERRlock: return EBUSY;
case ERRinvalidname: return ENOENT;
case ERRnosuchshare: return ENODEV;
}
}
if (eclass == ERRSRV) {
switch (num) {
case ERRbadpw: return EPERM;
case ERRaccess: return EACCES;
case ERRnoresource: return ENOMEM;
case ERRinvdevice: return ENODEV;
case ERRinvnetname: return ENODEV;
}
}
/* for other cases */
return EINVAL;
}
/* Return a UNIX errno from a NT status code */
static struct {
NTSTATUS status;
@ -405,9 +369,11 @@ static int cli_errno_from_nt(NTSTATUS status)
int cli_errno(struct cli_state *cli)
{
NTSTATUS status;
if (cli_is_nt_error(cli)) {
NTSTATUS status = cli_nt_error(cli);
return cli_errno_from_nt(status);
status = cli_nt_error(cli);
return cli_errno_from_nt(status);
}
if (cli_is_dos_error(cli)) {
@ -415,7 +381,8 @@ int cli_errno(struct cli_state *cli)
uint32 ecode;
cli_dos_error(cli, &eclass, &ecode);
return cli_errno_from_dos(eclass, ecode);
status = dos_to_ntstatus(eclass, ecode);
return cli_errno_from_nt(status);
}
/* for other cases */