Author: gd Date: 2006-03-21 00:04:05 +0000 (Tue, 21 Mar 2006) New Revision: 14597
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14597 Log: Merge DCERPC_FAULT constants from Samba 4. Guenther Modified: branches/SAMBA_3_0/source/include/rpc_dce.h branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c branches/SAMBA_3_0/source/rpc_server/srv_pipe.c branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c branches/SAMBA_3_0/source/rpc_server/srv_samr.c trunk/source/include/rpc_dce.h trunk/source/nsswitch/winbindd_pam.c trunk/source/rpc_server/srv_pipe.c trunk/source/rpc_server/srv_pipe_hnd.c trunk/source/rpc_server/srv_samr.c Changeset: Modified: branches/SAMBA_3_0/source/include/rpc_dce.h =================================================================== --- branches/SAMBA_3_0/source/include/rpc_dce.h 2006-03-20 23:40:43 UTC (rev 14596) +++ branches/SAMBA_3_0/source/include/rpc_dce.h 2006-03-21 00:04:05 UTC (rev 14597) @@ -82,6 +82,16 @@ #define RPC_PIPE_AUTH_SEAL_LEVEL 0x6 #endif +#define DCERPC_FAULT_OP_RNG_ERROR 0x1c010002 +#define DCERPC_FAULT_UNK_IF 0x1c010003 +#define DCERPC_FAULT_INVALID_TAG 0x1c000006 +#define DCERPC_FAULT_CONTEXT_MISMATCH 0x1c00001a +#define DCERPC_FAULT_OTHER 0x00000001 +#define DCERPC_FAULT_ACCESS_DENIED 0x00000005 +#define DCERPC_FAULT_CANT_PERFORM 0x000006d8 +#define DCERPC_FAULT_NDR 0x000006f7 + + /* Netlogon schannel auth type and level */ #define SCHANNEL_SIGN_SIGNATURE { 0x77, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 } #define SCHANNEL_SEAL_SIGNATURE { 0x77, 0x00, 0x7a, 0x00, 0xff, 0xff, 0x00, 0x00 } Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-03-20 23:40:43 UTC (rev 14596) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -1657,7 +1657,7 @@ got_info = True; /* only fallback when the chgpasswd3 call is not supported */ - } else if ((NT_STATUS_EQUAL(result, NT_STATUS(0x1c010002))) || + } else if ((NT_STATUS_EQUAL(result, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR))) || (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) || (NT_STATUS_EQUAL(result, NT_STATUS_NOT_IMPLEMENTED))) { Modified: branches/SAMBA_3_0/source/rpc_server/srv_pipe.c =================================================================== --- branches/SAMBA_3_0/source/rpc_server/srv_pipe.c 2006-03-20 23:40:43 UTC (rev 14596) +++ branches/SAMBA_3_0/source/rpc_server/srv_pipe.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -71,7 +71,7 @@ */ if(p->fault_state) { - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -284,7 +284,7 @@ */ if(p->fault_state) { - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -460,7 +460,7 @@ */ if(p->fault_state) { - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -2250,7 +2250,7 @@ * and not put the pipe into fault state. JRA. */ DEBUG(4, ("unknown\n")); - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -2268,7 +2268,7 @@ if (p->bad_handle_fault_state) { DEBUG(4,("api_rpcTNP: bad handle fault return.\n")); p->bad_handle_fault_state = False; - setup_fault_pdu(p, NT_STATUS(0x1C00001A)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_CONTEXT_MISMATCH)); return True; } Modified: branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c =================================================================== --- branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c 2006-03-20 23:40:43 UTC (rev 14596) +++ branches/SAMBA_3_0/source/rpc_server/srv_pipe_hnd.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -699,7 +699,7 @@ DEBUG(10,("process_complete_pdu: pipe %s in fault state.\n", p->name )); set_incoming_fault(p); - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return; } @@ -826,7 +826,7 @@ if (!reply) { DEBUG(3,("process_complete_pdu: DCE/RPC fault sent on pipe %s\n", p->pipe_srv_name)); set_incoming_fault(p); - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); prs_mem_free(&rpc_in); } else { /* Modified: branches/SAMBA_3_0/source/rpc_server/srv_samr.c =================================================================== --- branches/SAMBA_3_0/source/rpc_server/srv_samr.c 2006-03-20 23:40:43 UTC (rev 14596) +++ branches/SAMBA_3_0/source/rpc_server/srv_samr.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -849,7 +849,7 @@ /* Fix for W2K SP2 */ /* what is that status-code ? - gd */ if (q_u.switch_value == 0x1a) { - setup_fault_pdu(p, NT_STATUS(0x1c000006)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG)); return True; } return False; Modified: trunk/source/include/rpc_dce.h =================================================================== --- trunk/source/include/rpc_dce.h 2006-03-20 23:40:43 UTC (rev 14596) +++ trunk/source/include/rpc_dce.h 2006-03-21 00:04:05 UTC (rev 14597) @@ -82,6 +82,16 @@ #define RPC_PIPE_AUTH_SEAL_LEVEL 0x6 #endif +#define DCERPC_FAULT_OP_RNG_ERROR 0x1c010002 +#define DCERPC_FAULT_UNK_IF 0x1c010003 +#define DCERPC_FAULT_INVALID_TAG 0x1c000006 +#define DCERPC_FAULT_CONTEXT_MISMATCH 0x1c00001a +#define DCERPC_FAULT_OTHER 0x00000001 +#define DCERPC_FAULT_ACCESS_DENIED 0x00000005 +#define DCERPC_FAULT_CANT_PERFORM 0x000006d8 +#define DCERPC_FAULT_NDR 0x000006f7 + + /* Netlogon schannel auth type and level */ #define SCHANNEL_SIGN_SIGNATURE { 0x77, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 } #define SCHANNEL_SEAL_SIGNATURE { 0x77, 0x00, 0x7a, 0x00, 0xff, 0xff, 0x00, 0x00 } Modified: trunk/source/nsswitch/winbindd_pam.c =================================================================== --- trunk/source/nsswitch/winbindd_pam.c 2006-03-20 23:40:43 UTC (rev 14596) +++ trunk/source/nsswitch/winbindd_pam.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -1657,7 +1657,7 @@ got_info = True; /* only fallback when the chgpasswd3 call is not supported */ - } else if ((NT_STATUS_EQUAL(result, NT_STATUS(0x1c010002))) || + } else if ((NT_STATUS_EQUAL(result, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR))) || (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) || (NT_STATUS_EQUAL(result, NT_STATUS_NOT_IMPLEMENTED))) { Modified: trunk/source/rpc_server/srv_pipe.c =================================================================== --- trunk/source/rpc_server/srv_pipe.c 2006-03-20 23:40:43 UTC (rev 14596) +++ trunk/source/rpc_server/srv_pipe.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -71,7 +71,7 @@ */ if(p->fault_state) { - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -284,7 +284,7 @@ */ if(p->fault_state) { - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -460,7 +460,7 @@ */ if(p->fault_state) { - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -2250,7 +2250,7 @@ * and not put the pipe into fault state. JRA. */ DEBUG(4, ("unknown\n")); - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return True; } @@ -2268,7 +2268,7 @@ if (p->bad_handle_fault_state) { DEBUG(4,("api_rpcTNP: bad handle fault return.\n")); p->bad_handle_fault_state = False; - setup_fault_pdu(p, NT_STATUS(0x1C00001A)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_CONTEXT_MISMATCH)); return True; } Modified: trunk/source/rpc_server/srv_pipe_hnd.c =================================================================== --- trunk/source/rpc_server/srv_pipe_hnd.c 2006-03-20 23:40:43 UTC (rev 14596) +++ trunk/source/rpc_server/srv_pipe_hnd.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -699,7 +699,7 @@ DEBUG(10,("process_complete_pdu: pipe %s in fault state.\n", p->name )); set_incoming_fault(p); - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); return; } @@ -826,7 +826,7 @@ if (!reply) { DEBUG(3,("process_complete_pdu: DCE/RPC fault sent on pipe %s\n", p->pipe_srv_name)); set_incoming_fault(p); - setup_fault_pdu(p, NT_STATUS(0x1c010002)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_OP_RNG_ERROR)); prs_mem_free(&rpc_in); } else { /* Modified: trunk/source/rpc_server/srv_samr.c =================================================================== --- trunk/source/rpc_server/srv_samr.c 2006-03-20 23:40:43 UTC (rev 14596) +++ trunk/source/rpc_server/srv_samr.c 2006-03-21 00:04:05 UTC (rev 14597) @@ -849,7 +849,7 @@ /* Fix for W2K SP2 */ /* what is that status-code ? - gd */ if (q_u.switch_value == 0x1a) { - setup_fault_pdu(p, NT_STATUS(0x1c000006)); + setup_fault_pdu(p, NT_STATUS(DCERPC_FAULT_INVALID_TAG)); return True; } return False;
