Changeset 745 for trunk/server/librpc/idl/ntlmssp.idl

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• librpc/idl/ntlmssp.idl (modified) (6 diffs)

trunk/server/librpc/idl/ntlmssp.idl

@@ -87 +87 @@
         /* [MS-NLMP] 2.2.2.10 VERSION */
 
-        typedef struct {
+        typedef [public] struct {
                 ntlmssp_WindowsMajorVersion ProductMajorVersion;
                 ntlmssp_WindowsMinorVersion ProductMinorVersion;
@@ -93 +93 @@
                 uint8 Reserved[3];
                 ntlmssp_NTLMRevisionCurrent NTLMRevisionCurrent;
-        } VERSION;
+        } ntlmssp_VERSION;
 
         typedef [noprint,nodiscriminant] union {
-                [case(NTLMSSP_NEGOTIATE_VERSION)] VERSION version;
+                [case(NTLMSSP_NEGOTIATE_VERSION)] ntlmssp_VERSION version;
                 [default];
         } ntlmssp_Version;
@@ -106 +106 @@
                 [value(NtLmNegotiate)] ntlmssp_MessageType MessageType;
                 NEGOTIATE NegotiateFlags;
-                [value(strlen(DomainName))] uint16 DomainNameLen;
+                [value(DomainName ? strlen(DomainName) : 0)] uint16 DomainNameLen;
                 [value(DomainNameLen)] uint16 DomainNameMaxLen;
                 [relative] [subcontext(0),subcontext_size(DomainNameLen)] [flag(ndr_ntlmssp_negotiated_string_flags(NTLMSSP_NEGOTIATE_OEM))] string *DomainName;
-                [value(strlen(Workstation))] uint16 WorkstationLen;
+                [value(Workstation ? strlen(Workstation) : 0)] uint16 WorkstationLen;
                 [value(WorkstationLen)] uint16 WorkstationMaxLen;
                 [relative] [subcontext(0),subcontext_size(WorkstationLen)] [flag(ndr_ntlmssp_negotiated_string_flags(NTLMSSP_NEGOTIATE_OEM))] string *Workstation;
@@ -163 +163 @@
         typedef [public,flag(NDR_NOALIGN)] struct {
                 ntlmssp_AvId AvId;
-                [value(ndr_size_ntlmssp_AvValue(&r->Value, r->AvId, ndr->iconv_convenience, 0))] uint16 AvLen;
+                [value(ndr_size_ntlmssp_AvValue(&r->Value, r->AvId, 0))] uint16 AvLen;
                 [subcontext(0),subcontext_size(AvLen),switch_is(AvId)] ntlmssp_AvValue Value;
         } AV_PAIR;
@@ -183 +183 @@
                 uint8 ServerChallenge[8];
                 uint8 Reserved[8];
-                [value(ndr_size_AV_PAIR_LIST(TargetInfo, ndr->iconv_convenience, ndr->flags))] uint16 TargetInfoLen;
+                [value(ndr_size_AV_PAIR_LIST(TargetInfo, ndr->flags))] uint16 TargetInfoLen;
                 [value(TargetInfoLen)] uint16 TargetNameInfoMaxLen;
                 [relative] [subcontext(0),subcontext_size(TargetInfoLen)] AV_PAIR_LIST *TargetInfo;
@@ -314 +314 @@
                 );
 
+        void decode_NTLMv2_RESPONSE(
+                [in] NTLMv2_RESPONSE response
+                );
+
 }