r14715: Correct the definition of the DCE/RPC bind_nak, per the OpenGroup spec.

This allows us to correctly parse the bind_nak from NT4, when we use
an invalid auth type (the unsupported SPNEGO)..

Andrew Bartlett
(This used to be commit ce0c7f86fd5eeeacad885d732b66c65ac9103ace)

1 files changed, 12 insertions, 1 deletions

diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl
index e0366adf07..5a91f66987 100644
--- a/source4/librpc/idl/dcerpc.idl
+++ b/source4/librpc/idl/dcerpc.idl
@@ -59,6 +59,8 @@ interface dcerpc
 
 	const int DCERPC_BIND_PROVIDER_REJECT = 2;
 	const int DCERPC_BIND_REASON_ASYNTAX  = 1;
+	const int DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED = 4;
+	const int DCERPC_BIND_REASON_INVALID_AUTH_TYPE = 8;
 
 	typedef struct {
 		uint16 result;
@@ -78,9 +80,18 @@ interface dcerpc
 	} dcerpc_bind_ack;
 
 	typedef struct {
-		uint16 reject_reason;
 		uint32 num_versions;
 		uint32 versions[num_versions];
+	} dcerpc_bind_nak_versions;
+	
+	typedef [nodiscriminant] union {
+		[case(DECRPC_BIND_PROTOCOL_VERSION_NOT_SUPPORTED)] dcerpc_bind_nak_versions v;
+		[default] ;
+	} dcerpc_bind_nak_versions_ctr;
+
+	typedef struct {
+		uint16 reject_reason;
+		[switch_is(reject_reason)] dcerpc_bind_nak_versions_ctr versions;
 	} dcerpc_bind_nak;
 
 	const uint8 DCERPC_RESPONSE_LENGTH = 24;