[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  4361092 s3: Safely mark our sconn as smb2 if we have that protocol
      from  28f0326 s3:smbcacls: fix parsing of multiple flags

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 43610924c0052d8ea2defb54493677607a06332a
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 30 16:30:54 2011 +0200

    s3: Safely mark our sconn as smb2 if we have that protocol
    
    Otherwise smbd will crash at an unclean exit. Without this conn_close_all will
    do a close_cnum() on all connection_struct's. In smb2, those are talloc
    children of the smbd_smb2_tcon's. sconn is talloc_free'ed after the
    conn_close_all, but the smbd_smb2_tcon destructor will still reference
    tcon->compat_conn, referencing then free'ed (and null'ed out) memory.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Mon May 30 22:49:53 CEST 2011 on sn-devel-104
    (cherry picked from commit c981d4fa1269569a1c2db4bf72a67a357aacd69f)
    
    Fix bug #8199 (potential crash in smbd handling smb2).

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

Summary of changes:
 source3/smbd/smb2_negprot.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index f9528f8..f639503 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -177,5 +177,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 
 	outdyn = security_buffer;
 
+	req->sconn->using_smb2 = true;
+
 	return smbd_smb2_request_done(req, outbody, &outdyn);
 }


-- 
Samba Shared Repository