svn commit: samba r3792 - in branches/SAMBA_4_0/source: libcli/util librpc/rpc

[tridge at samba.org]

Author: tridge
Date: 2004-11-17 00:31:56 +0000 (Wed, 17 Nov 2004)
New Revision: 3792

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3792

Log:
improved the posix -> nt error mapping, so we get things like
NT_STATUS_HOST_UNREACHABLE instead of NT_STATUS_UNSUCCESSFUL

Modified:
   branches/SAMBA_4_0/source/libcli/util/errormap.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/util/errormap.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/util/errormap.c	2004-11-16 23:41:18 UTC (rev 3791)
+++ branches/SAMBA_4_0/source/libcli/util/errormap.c	2004-11-17 00:31:56 UTC (rev 3792)
@@ -1518,6 +1518,18 @@
 	{ ECONNREFUSED, NT_STATUS_CONNECTION_REFUSED },
 	{ EBUSY,        NT_STATUS_SHARING_VIOLATION },
 	{ ENOTSUP,      NT_STATUS_NOT_SUPPORTED},
+#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

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2004-11-16 23:41:18 UTC (rev 3791)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_util.c	2004-11-17 00:31:56 UTC (rev 3792)
@@ -1003,7 +1003,8 @@
 
 	status = dcerpc_pipe_open_tcp(p, binding->host, port);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("Failed to connect to %s:%d\n", binding->host, port));
+		DEBUG(0,("Failed to connect to %s:%d - %s\n", 
+			 binding->host, port, nt_errstr(status)));
                 return status;
         }