summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-08-18 06:14:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:06 -0500
commit70f457bd1a13275faa5f33754ef819a5f75e0374 (patch)
treea989b6552281df299797d44d2e458e1e013e56be
parent84da00004be647d92230fb97e2610daaed3dfd93 (diff)
downloadsamba-70f457bd1a13275faa5f33754ef819a5f75e0374.tar.gz
samba-70f457bd1a13275faa5f33754ef819a5f75e0374.tar.bz2
samba-70f457bd1a13275faa5f33754ef819a5f75e0374.zip
r1872: revert -r 1845 because the caling function should look at the fault_code
when it gets NT_STATUS_NET_WRITE_FAULT metze (This used to be commit 084845c1ab5e8acdb91f1d93b87d3f58e5de1bfd)
-rw-r--r--source4/build/pidl/server.pm2
-rw-r--r--source4/librpc/rpc/dcerpc.c14
2 files changed, 3 insertions, 13 deletions
diff --git a/source4/build/pidl/server.pm b/source4/build/pidl/server.pm
index aa44d9cbb2..2c590ea642 100644
--- a/source4/build/pidl/server.pm
+++ b/source4/build/pidl/server.pm
@@ -102,7 +102,7 @@ pidl "
}
if (dce_call->fault_code != 0) {
- return dcerpc_map_fault2ntstatus(dce_call->fault_code);
+ return NT_STATUS_NET_WRITE_FAULT;
}
return NT_STATUS_OK;
}
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index edd0469d6e..438a9a4cf3 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -95,16 +95,6 @@ void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v)
}
}
-NTSTATUS dcerpc_map_fault2ntstatus(uint32_t fault_code)
-{
- switch (fault_code) {
- case DCERPC_FAULT_LOGON_FAILURE:
- return NT_STATUS_LOGON_FAILURE;
- }
-
- return NT_STATUS_NET_WRITE_FAULT;
-}
-
/*
parse a data blob into a dcerpc_packet structure. This handles both
input and output packets
@@ -626,7 +616,7 @@ NTSTATUS dcerpc_request(struct dcerpc_pipe *p,
if (pkt.ptype == DCERPC_PKT_FAULT) {
DEBUG(5,("rpc fault 0x%x\n", pkt.u.fault.status));
p->last_fault_code = pkt.u.fault.status;
- return dcerpc_map_fault2ntstatus(pkt.u.fault.status);
+ return NT_STATUS_NET_WRITE_FAULT;
}
if (pkt.ptype != DCERPC_PKT_RESPONSE) {
@@ -661,7 +651,7 @@ NTSTATUS dcerpc_request(struct dcerpc_pipe *p,
if (pkt.ptype == DCERPC_PKT_FAULT) {
p->last_fault_code = pkt.u.fault.status;
- return dcerpc_map_fault2ntstatus(pkt.u.fault.status);
+ return NT_STATUS_NET_WRITE_FAULT;
}
if (pkt.ptype != DCERPC_PKT_RESPONSE) {