diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-17 16:06:34 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-17 17:09:00 +1000 |
| commit | 4162c7b74aa94ee77ef47f0abae058b80eca6e38 (patch) | |
| tree | 7a1f1653eb6146a4616915908ee51c6eff061e5c | |
| parent | e645675aa46e945da5293b54a1bd368599b7b5a7 (diff) | |
| download | samba-4162c7b74aa94ee77ef47f0abae058b80eca6e38.tar.gz samba-4162c7b74aa94ee77ef47f0abae058b80eca6e38.tar.bz2 samba-4162c7b74aa94ee77ef47f0abae058b80eca6e38.zip | |
errors: reorder error codes for easier s3/s4 comparison
| -rw-r--r-- | source3/lib/errmap_unix.c | 22 | ||||
| -rw-r--r-- | source4/libcli/util/errormap.c | 6 |
2 files changed, 14 insertions, 14 deletions
diff --git a/source3/lib/errmap_unix.c b/source3/lib/errmap_unix.c index 8de397c730..ea195474ef 100644 --- a/source3/lib/errmap_unix.c +++ b/source3/lib/errmap_unix.c @@ -28,6 +28,14 @@ static const struct { int unix_error; NTSTATUS nt_error; } unix_nt_errmap[] = { + { EAGAIN, NT_STATUS_NETWORK_BUSY }, + { EINTR, NT_STATUS_RETRY }, +#ifdef ENOBUFS + { ENOBUFS, NT_STATUS_INSUFFICIENT_RESOURCES }, +#endif +#ifdef EWOULDBLOCK + { EWOULDBLOCK, NT_STATUS_NETWORK_BUSY }, +#endif { EPERM, NT_STATUS_ACCESS_DENIED }, { EACCES, NT_STATUS_ACCESS_DENIED }, { ENOENT, NT_STATUS_OBJECT_NAME_NOT_FOUND }, @@ -41,8 +49,10 @@ static const struct { { ENOSPC, NT_STATUS_DISK_FULL }, { ENOMEM, NT_STATUS_NO_MEMORY }, { EISDIR, NT_STATUS_FILE_IS_A_DIRECTORY}, +#ifdef EPIPE + { EPIPE, NT_STATUS_PIPE_BROKEN}, +#endif { EMLINK, NT_STATUS_TOO_MANY_LINKS }, - { EINTR, NT_STATUS_RETRY }, { ENOSYS, NT_STATUS_NOT_SUPPORTED }, #ifdef ELOOP { ELOOP, NT_STATUS_OBJECT_PATH_NOT_FOUND }, @@ -68,10 +78,6 @@ static const struct { #ifdef EFBIG { EFBIG, NT_STATUS_DISK_FULL }, #endif -#ifdef ENOBUFS - { ENOBUFS, NT_STATUS_INSUFFICIENT_RESOURCES }, -#endif - { EAGAIN, NT_STATUS_NETWORK_BUSY }, #ifdef EADDRINUSE { EADDRINUSE, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED}, #endif @@ -96,12 +102,6 @@ static const struct { #ifdef ENODEV { ENODEV, NT_STATUS_DEVICE_DOES_NOT_EXIST}, #endif -#ifdef EPIPE - { EPIPE, NT_STATUS_PIPE_BROKEN}, -#endif -#ifdef EWOULDBLOCK - { EWOULDBLOCK, NT_STATUS_NETWORK_BUSY }, -#endif #ifdef ENOATTR { ENOATTR, NT_STATUS_NOT_FOUND }, #endif diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c index 23432ca22f..a264a25950 100644 --- a/source4/libcli/util/errormap.c +++ b/source4/libcli/util/errormap.c @@ -599,8 +599,11 @@ static const struct { { EMSGSIZE, NT_STATUS_INVALID_BUFFER_SIZE }, { ENOMEM, NT_STATUS_NO_MEMORY }, { EISDIR, NT_STATUS_FILE_IS_A_DIRECTORY}, +#ifdef EPIPE { EPIPE, NT_STATUS_CONNECTION_DISCONNECTED }, +#endif { EBUSY, NT_STATUS_SHARING_VIOLATION }, + { ENOSYS, NT_STATUS_INVALID_SYSTEM_SERVICE }, #ifdef EOPNOTSUPP { EOPNOTSUPP, NT_STATUS_NOT_SUPPORTED}, #endif @@ -664,9 +667,6 @@ static const struct { #ifdef ECANCELED { ECANCELED, NT_STATUS_CANCELLED}, #endif -#ifdef ENOSYS - { ENOSYS, NT_STATUS_INVALID_SYSTEM_SERVICE }, -#endif #ifdef ENOTSUP { ENOTSUP, NT_STATUS_NOT_SUPPORTED}, #endif |