svn commit: samba r1872 - in branches/SAMBA_4_0/source: build/pidl librpc/rpc

metze at samba.org metze at samba.org
Wed Aug 18 06:14:48 GMT 2004


Author: metze
Date: 2004-08-18 06:14:47 +0000 (Wed, 18 Aug 2004)
New Revision: 1872

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1872&nolog=1

Log:
revert -r 1845 because the caling function should look at the fault_code
when it gets NT_STATUS_NET_WRITE_FAULT

metze

Modified:
   branches/SAMBA_4_0/source/build/pidl/server.pm
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/server.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/server.pm	2004-08-17 20:11:52 UTC (rev 1871)
+++ branches/SAMBA_4_0/source/build/pidl/server.pm	2004-08-18 06:14:47 UTC (rev 1872)
@@ -102,7 +102,7 @@
 	}
 
 	if (dce_call->fault_code != 0) {
-		return dcerpc_map_fault2ntstatus(dce_call->fault_code);
+		return NT_STATUS_NET_WRITE_FAULT;
 	}
 	return NT_STATUS_OK;
 }

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2004-08-17 20:11:52 UTC (rev 1871)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c	2004-08-18 06:14:47 UTC (rev 1872)
@@ -95,16 +95,6 @@
 	}
 }
 
-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 @@
 	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 @@
 
 		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) {



More information about the samba-cvs mailing list