Author: jra Date: 2007-06-20 01:26:18 +0000 (Wed, 20 Jun 2007) New Revision: 23550
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23550 Log: Add more UNIX error -> NT status mappings. Jeremy. Modified: branches/SAMBA_3_0/source/lib/errmap_unix.c branches/SAMBA_3_0_25/source/libsmb/errormap.c branches/SAMBA_3_0_26/source/lib/errmap_unix.c Changeset: Modified: branches/SAMBA_3_0/source/lib/errmap_unix.c =================================================================== --- branches/SAMBA_3_0/source/lib/errmap_unix.c 2007-06-19 21:40:27 UTC (rev 23549) +++ branches/SAMBA_3_0/source/lib/errmap_unix.c 2007-06-20 01:26:18 UTC (rev 23550) @@ -63,9 +63,34 @@ { ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES }, #endif { EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY }, +#ifdef EADDRINUSE + { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED}, +#endif +#ifdef ENETUNREACH + { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE}, +#endif +#ifdef EHOSTUNREACH + { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE}, +#endif +#ifdef ECONNREFUSED + { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED}, +#endif +#ifdef ETIMEDOUT + { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT}, +#endif +#ifdef ECONNABORTED + { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED}, +#endif +#ifdef ENODEV + { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST}, +#endif +#ifdef EPIPE + { EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN}, +#endif #ifdef EWOULDBLOCK { EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY }, #endif + { 0, 0, 0, NT_STATUS_OK } }; Modified: branches/SAMBA_3_0_25/source/libsmb/errormap.c =================================================================== --- branches/SAMBA_3_0_25/source/libsmb/errormap.c 2007-06-19 21:40:27 UTC (rev 23549) +++ branches/SAMBA_3_0_25/source/libsmb/errormap.c 2007-06-20 01:26:18 UTC (rev 23550) @@ -1542,6 +1542,34 @@ #ifdef ENOBUFS { ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES }, #endif + { EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY }, +#ifdef EADDRINUSE + { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED}, +#endif +#ifdef ENETUNREACH + { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE}, +#endif +#ifdef EHOSTUNREACH + { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE}, +#endif +#ifdef ECONNREFUSED + { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED}, +#endif +#ifdef ETIMEDOUT + { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT}, +#endif +#ifdef ECONNABORTED + { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED}, +#endif +#ifdef ENODEV + { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST}, +#endif +#ifdef EPIPE + {EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN}, +#endif +#ifdef EWOULDBLOCK + { EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY }, +#endif { 0, 0, 0, NT_STATUS_OK } }; Modified: branches/SAMBA_3_0_26/source/lib/errmap_unix.c =================================================================== --- branches/SAMBA_3_0_26/source/lib/errmap_unix.c 2007-06-19 21:40:27 UTC (rev 23549) +++ branches/SAMBA_3_0_26/source/lib/errmap_unix.c 2007-06-20 01:26:18 UTC (rev 23550) @@ -63,9 +63,34 @@ { ENOBUFS, ERRDOS, ERRnomem, NT_STATUS_INSUFFICIENT_RESOURCES }, #endif { EAGAIN, ERRDOS, 111, NT_STATUS_NETWORK_BUSY }, +#ifdef EADDRINUSE + { EADDRINUSE, ERRDOS, 52, NT_STATUS_ADDRESS_ALREADY_ASSOCIATED}, +#endif +#ifdef ENETUNREACH + { ENETUNREACH, ERRHRD, ERRgeneral, NT_STATUS_NETWORK_UNREACHABLE}, +#endif +#ifdef EHOSTUNREACH + { EHOSTUNREACH, ERRHRD, ERRgeneral, NT_STATUS_HOST_UNREACHABLE}, +#endif +#ifdef ECONNREFUSED + { ECONNREFUSED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_REFUSED}, +#endif +#ifdef ETIMEDOUT + { ETIMEDOUT, ERRHRD, 121, NT_STATUS_IO_TIMEOUT}, +#endif +#ifdef ECONNABORTED + { ECONNABORTED, ERRHRD, ERRgeneral, NT_STATUS_CONNECTION_ABORTED}, +#endif +#ifdef ENODEV + { ENODEV, ERRDOS, 55, NT_STATUS_DEVICE_DOES_NOT_EXIST}, +#endif +#ifdef EPIPE + { EPIPE, ERRDOS, 109, NT_STATUS_PIPE_BROKEN}, +#endif #ifdef EWOULDBLOCK { EWOULDBLOCK, ERRDOS, 111, NT_STATUS_NETWORK_BUSY }, #endif + { 0, 0, 0, NT_STATUS_OK } };