diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-31 09:08:43 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-31 02:57:19 +0200 |
| commit | 159fad92d9f46acf41e9be35b8fa42ea51610426 (patch) | |
| tree | 21caf2d23844ec8258a50bd72223ca72af6a9a30 /source4/libcli | |
| parent | aa848c12eba441700557af78cb2ad23661d56f21 (diff) | |
| download | samba-159fad92d9f46acf41e9be35b8fa42ea51610426.tar.gz samba-159fad92d9f46acf41e9be35b8fa42ea51610426.tar.bz2 samba-159fad92d9f46acf41e9be35b8fa42ea51610426.zip | |
s4-libcli Merge error map order with source3 errmap_unix.c
This makes it easier to see what the actual differences here are.
Andrew Bartlett
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/util/errormap.c | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c index 16e0746bad..6392a6208c 100644 --- a/source4/libcli/util/errormap.c +++ b/source4/libcli/util/errormap.c @@ -629,43 +629,21 @@ static const struct { { ENFILE, NT_STATUS_TOO_MANY_OPENED_FILES }, { EMFILE, NT_STATUS_TOO_MANY_OPENED_FILES }, { ENOSPC, NT_STATUS_DISK_FULL }, - { EISDIR, NT_STATUS_FILE_IS_A_DIRECTORY }, { ENOTSOCK, NT_STATUS_INVALID_HANDLE }, { EFAULT, NT_STATUS_INVALID_PARAMETER }, { EMSGSIZE, NT_STATUS_INVALID_BUFFER_SIZE }, { ENOMEM, NT_STATUS_NO_MEMORY }, + { EISDIR, NT_STATUS_FILE_IS_A_DIRECTORY}, { EPIPE, NT_STATUS_CONNECTION_DISCONNECTED }, - { ECONNREFUSED, NT_STATUS_CONNECTION_REFUSED }, -#ifdef ECONNRESET - { ECONNRESET, NT_STATUS_CONNECTION_RESET }, -#endif { EBUSY, NT_STATUS_SHARING_VIOLATION }, -#ifdef ENOTSUP - { ENOTSUP, NT_STATUS_NOT_SUPPORTED}, -#endif #ifdef EOPNOTSUPP { EOPNOTSUPP, NT_STATUS_NOT_SUPPORTED}, #endif -#ifdef EHOSTUNREACH - { EHOSTUNREACH, NT_STATUS_HOST_UNREACHABLE }, -#endif -#ifdef ENETUNREACH - { ENETUNREACH, NT_STATUS_NETWORK_UNREACHABLE }, -#endif -#ifdef ETIMEDOUT - { ETIMEDOUT, NT_STATUS_IO_TIMEOUT }, -#endif -#ifdef EADDRINUSE - { EADDRINUSE, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED }, -#endif -#ifdef ENOATTR - { ENOATTR, NT_STATUS_NOT_FOUND }, -#endif #ifdef ENODATA { ENODATA, NT_STATUS_NOT_FOUND }, #endif #ifdef EDQUOT - { EDQUOT, NT_STATUS_DISK_FULL }, /* Windows does NOT return NT_STATUS_QUOTA_EXCEEDED */ + { EDQUOT, NT_STATUS_DISK_FULL }, /* Windows apps need this, not NT_STATUS_QUOTA_EXCEEDED */ #endif #ifdef ENOTEMPTY { ENOTEMPTY, NT_STATUS_DIRECTORY_NOT_EMPTY }, @@ -682,26 +660,50 @@ static const struct { #ifdef EFBIG { EFBIG, NT_STATUS_DISK_FULL }, #endif +#ifdef EADDRINUSE + { EADDRINUSE, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED}, +#endif +#ifdef ENETUNREACH + { ENETUNREACH, NT_STATUS_NETWORK_UNREACHABLE}, +#endif +#ifdef EHOSTUNREACH + { EHOSTUNREACH, NT_STATUS_HOST_UNREACHABLE}, +#endif +#ifdef ECONNREFUSED + { ECONNREFUSED, NT_STATUS_CONNECTION_REFUSED}, +#endif #ifdef EADDRNOTAVAIL { EADDRNOTAVAIL,NT_STATUS_ADDRESS_NOT_ASSOCIATED }, #endif +#ifdef ETIMEDOUT + { ETIMEDOUT, NT_STATUS_IO_TIMEOUT}, +#endif #ifdef ESOCKTNOSUPPORT { ESOCKTNOSUPPORT,NT_STATUS_INVALID_PARAMETER_MIX }, #endif #ifdef EAFNOSUPPORT { EAFNOSUPPORT, NT_STATUS_INVALID_PARAMETER_MIX }, #endif +#ifdef ECONNRESET + { ECONNRESET, NT_STATUS_CONNECTION_RESET}, +#endif #ifdef ENOPROTOOPT { ENOPROTOOPT, NT_STATUS_INVALID_PARAMETER_MIX }, #endif #ifdef ENODEV { ENODEV, NT_STATUS_NO_SUCH_DEVICE }, #endif +#ifdef ENOATTR + { ENOATTR, NT_STATUS_NOT_FOUND }, +#endif +#ifdef ECANCELED + { ECANCELED, NT_STATUS_CANCELLED}, +#endif #ifdef ENOSYS { ENOSYS, NT_STATUS_INVALID_SYSTEM_SERVICE }, #endif -#ifdef ECANCELED - { ECANCELED, NT_STATUS_CANCELLED }, +#ifdef ENOTSUP + { ENOTSUP, NT_STATUS_NOT_SUPPORTED}, #endif { 0, NT_STATUS_UNSUCCESSFUL } |