summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-06 00:14:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:41 -0500
commitc8b8212a83c43e6629432dc33402c3897a253493 (patch)
tree8e2118eb2a9bc9ad14358ac173af105e0b2697a5 /source4/librpc
parentfcc74fc060ff6e721c78cde0ace517c3d91325f3 (diff)
downloadsamba-c8b8212a83c43e6629432dc33402c3897a253493.tar.gz
samba-c8b8212a83c43e6629432dc33402c3897a253493.tar.bz2
samba-c8b8212a83c43e6629432dc33402c3897a253493.zip
r7314: the various ncacn and ncadg PDU's share the same namespace
(This used to be commit 58fee22e0b5054de631cc5929498d490db31f348)
Diffstat (limited to 'source4/librpc')
-rw-r--r--source4/librpc/idl/dcerpc.idl38
1 files changed, 16 insertions, 22 deletions
diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl
index a3949b737f..a64f41906a 100644
--- a/source4/librpc/idl/dcerpc.idl
+++ b/source4/librpc/idl/dcerpc.idl
@@ -217,32 +217,26 @@ interface dcerpc
typedef [nodiscriminant] union {
[case(DCERPC_PKT_REQUEST)] dcerpc_request request;
+ [case(DCERPC_PKT_PING)] dcerpc_ping ping;
[case(DCERPC_PKT_RESPONSE)] dcerpc_response response;
+ [case(DCERPC_PKT_FAULT)] dcerpc_fault fault;
+ [case(DCERPC_PKT_WORKING)] dcerpc_working working;
+ [case(DCERPC_PKT_NOCALL)] dcerpc_fack nocall;
+ [case(DCERPC_PKT_REJECT)] dcerpc_fault reject;
+ [case(DCERPC_PKT_ACK)] dcerpc_ack ack;
+ [case(DCERPC_PKT_CL_CANCEL)] dcerpc_cl_cancel cl_cancel;
+ [case(DCERPC_PKT_FACK)] dcerpc_fack fack;
+ [case(DCERPC_PKT_CANCEL_ACK)] dcerpc_cancel_ack cancel_ack;
[case(DCERPC_PKT_BIND)] dcerpc_bind bind;
[case(DCERPC_PKT_BIND_ACK)] dcerpc_bind_ack bind_ack;
+ [case(DCERPC_PKT_BIND_NAK)] dcerpc_bind_nak bind_nak;
[case(DCERPC_PKT_ALTER)] dcerpc_bind alter;
[case(DCERPC_PKT_ALTER_RESP)] dcerpc_bind_ack alter_resp;
- [case(DCERPC_PKT_FAULT)] dcerpc_fault fault;
+ [case(DCERPC_PKT_SHUTDOWN)] dcerpc_shutdown shutdown;
+ [case(DCERPC_PKT_CO_CANCEL)] dcerpc_co_cancel co_cancel;
+ [case(DCERPC_PKT_ORPHANED)] dcerpc_orphaned orphaned;
[case(DCERPC_PKT_AUTH3)] dcerpc_auth3 auth3;
- [case(DCERPC_PKT_BIND_NAK)] dcerpc_bind_nak bind_nak;
- [case(DCERPC_PKT_CO_CANCEL)] dcerpc_co_cancel cancel;
- [case(DCERPC_PKT_ORPHANED)] dcerpc_orphaned orphaned;
- [case(DCERPC_PKT_SHUTDOWN)] dcerpc_shutdown shutdown;
- } ncacn_payload;
-
- typedef [nodiscriminant] union {
- [case(DCERPC_PKT_REQUEST)] dcerpc_request request;
- [case(DCERPC_PKT_PING)] dcerpc_ping ping;
- [case(DCERPC_PKT_RESPONSE)] dcerpc_response response;
- [case(DCERPC_PKT_FAULT)] dcerpc_fault fault;
- [case(DCERPC_PKT_WORKING)] dcerpc_working working;
- [case(DCERPC_PKT_NOCALL)] dcerpc_fack nocall;
- [case(DCERPC_PKT_REJECT)] dcerpc_fault reject;
- [case(DCERPC_PKT_ACK)] dcerpc_ack ack;
- [case(DCERPC_PKT_CANCEL_ACK)] dcerpc_cancel_ack cancel_ack;
- [case(DCERPC_PKT_FACK)] dcerpc_fack fack;
- [case(DCERPC_PKT_CL_CANCEL)] dcerpc_cl_cancel cancel;
- } ncadg_payload;
+ } dcerpc_payload;
/* pfc_flags values */
const uint8 DCERPC_PFC_FLAG_FIRST = 0x01;
@@ -267,7 +261,7 @@ interface dcerpc
uint16 frag_length; /* Total length of fragment */
uint16 auth_length; /* authenticator length */
uint32 call_id; /* Call identifier */
- [switch_is(ptype)] ncacn_payload u;
+ [switch_is(ptype)] dcerpc_payload u;
} ncacn_packet;
typedef [public] struct {
@@ -290,6 +284,6 @@ interface dcerpc
uint16 fragnum;
uint8 auth_proto;
uint8 serial_low;
- [switch_is(ptype)] ncadg_payload u;
+ [switch_is(ptype)] dcerpc_payload u;
} ncadg_packet;
}