diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-04 13:47:26 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-06 07:51:24 +0200 |
| commit | 865a93767159be087ec78f56687c4d3ba24a3756 (patch) | |
| tree | cb440d4a3bfd0cb285490f48e335666b19f84a8e /source3/libsmb | |
| parent | fa289e8982ea260a87548c145ef061e7eb64acf6 (diff) | |
| download | samba-865a93767159be087ec78f56687c4d3ba24a3756.tar.gz samba-865a93767159be087ec78f56687c4d3ba24a3756.tar.bz2 samba-865a93767159be087ec78f56687c4d3ba24a3756.zip | |
errors: Merge ntstatus -> DOS error table between Samba3 and Samba4.
They are now identical
Andrew Bartlett
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/errormap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/libsmb/errormap.c b/source3/libsmb/errormap.c index bc9676bbff..d8c3cc0133 100644 --- a/source3/libsmb/errormap.c +++ b/source3/libsmb/errormap.c @@ -53,10 +53,16 @@ /* NT status -> dos error map */ static const struct { - uint8 dos_class; - uint32 dos_code; + uint8_t dos_class; + uint32_t dos_code; NTSTATUS ntstatus; } ntstatus_to_dos_map[] = { +/* + * Not an official error, as only bit 0x80000000, not bits 0xC0000000 are set. + */ + {ERRDOS, ERRmoredata, STATUS_BUFFER_OVERFLOW}, + {ERRDOS, ERRnofiles, STATUS_NO_MORE_FILES}, + {ERRDOS, ERRnofiles, NT_STATUS_NO_MORE_ENTRIES}, {ERRDOS, ERRgeneral, NT_STATUS_UNSUCCESSFUL}, {ERRDOS, ERRbadfunc, NT_STATUS_NOT_IMPLEMENTED}, {ERRDOS, 87, NT_STATUS_INVALID_INFO_CLASS}, @@ -105,11 +111,6 @@ static const struct { */ {ERRDOS, ERRnoaccess, NT_STATUS_ACCESS_DENIED}, {ERRDOS, 111, NT_STATUS_BUFFER_TOO_SMALL}, -/* - * Not an official error, as only bit 0x80000000, not bits 0xC0000000 are set. - */ - {ERRDOS, ERRmoredata, STATUS_BUFFER_OVERFLOW}, - {ERRDOS, ERRnofiles, STATUS_NO_MORE_FILES}, {ERRDOS, ERRbadfid, NT_STATUS_OBJECT_TYPE_MISMATCH}, {ERRHRD, ERRgeneral, NT_STATUS_NONCONTINUABLE_EXCEPTION}, {ERRHRD, ERRgeneral, NT_STATUS_INVALID_DISPOSITION}, @@ -1448,7 +1449,7 @@ NTSTATUS dos_to_ntstatus(uint8 eclass, uint32 ecode) /***************************************************************************** convert a NT status code to a dos class/code *****************************************************************************/ -void ntstatus_to_dos(NTSTATUS ntstatus, uint8 *eclass, uint32 *ecode) +void ntstatus_to_dos(NTSTATUS ntstatus, uint8_t *eclass, uint32_t *ecode) { int i; if (NT_STATUS_IS_OK(ntstatus)) { |