summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-05-30 16:30:54 +0200
committerVolker Lendecke <vlendec@samba.org>2011-05-30 22:49:53 +0200
commitc981d4fa1269569a1c2db4bf72a67a357aacd69f (patch)
treed77c6e1025e718fb18b14790f30d11166b8ebed4
parente10f27d5759b2d21c82fdb20f5641e1f6feab158 (diff)
downloadsamba-c981d4fa1269569a1c2db4bf72a67a357aacd69f.tar.gz
samba-c981d4fa1269569a1c2db4bf72a67a357aacd69f.tar.bz2
samba-c981d4fa1269569a1c2db4bf72a67a357aacd69f.zip
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@samba.org> Autobuild-Date: Mon May 30 22:49:53 CEST 2011 on sn-devel-104
-rw-r--r--source3/smbd/smb2_negprot.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index f9528f823a..f639503ad4 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);
}