[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Tue Sep 14 09:58:44 MDT 2010


The branch, master has been updated
       via  33da33c ntlmssp: when pushing an ntlmssp NEGOTIATE_MESSAGE deal with NULL strings.
      from  48976ac rpc_server: Remove unnecessary dependency on server modules, build system will take care of that.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 33da33c59e431f6f097bdd143fb48db465607669
Author: Günther Deschner <gd at samba.org>
Date:   Tue Sep 14 17:57:23 2010 +0200

    ntlmssp: when pushing an ntlmssp NEGOTIATE_MESSAGE deal with NULL strings.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 librpc/idl/ntlmssp.idl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/ntlmssp.idl b/librpc/idl/ntlmssp.idl
index e26dc31..b9be7da 100644
--- a/librpc/idl/ntlmssp.idl
+++ b/librpc/idl/ntlmssp.idl
@@ -105,10 +105,10 @@ interface ntlmssp
 		[charset(DOS),value("NTLMSSP")] uint8 Signature[8];
 		[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;
 		[switch_is(NegotiateFlags & NTLMSSP_NEGOTIATE_VERSION)] ntlmssp_Version Version;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list