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

diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
index 16e0746badaa206eddba33f55bba1412e762e6fa..6392a6208c8c3d04e78e82ef183ade3ac4a2b375 100644 (file)
--- 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 }