summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-17 00:31:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:54 -0500
commit285db3339931c47a569f49e8e18760d6185aac54 (patch)
treef7cdbd6a911c349073faadb5eed242aae760a8a0
parent7f340a29977e89b67d66473085e98db7b2ce71f6 (diff)
downloadsamba-285db3339931c47a569f49e8e18760d6185aac54.tar.gz
samba-285db3339931c47a569f49e8e18760d6185aac54.tar.bz2
samba-285db3339931c47a569f49e8e18760d6185aac54.zip
r3792: improved the posix -> nt error mapping, so we get things like
NT_STATUS_HOST_UNREACHABLE instead of NT_STATUS_UNSUCCESSFUL (This used to be commit f2a488e5668ab5d262269f1bab1b33a63265cbe9)
-rw-r--r--source4/libcli/util/errormap.c12
-rw-r--r--source4/librpc/rpc/dcerpc_util.c3
2 files changed, 14 insertions, 1 deletions
diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
index 417f4571a7..6849d7d0cd 100644
--- a/source4/libcli/util/errormap.c
+++ b/source4/libcli/util/errormap.c
@@ -1518,6 +1518,18 @@ const struct unix_error_map unix_nt_errmap[] = {
{ 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
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 5c824cec99..c53e879802 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -1003,7 +1003,8 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p,
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;
}