The branch, v3-6-test has been updated via 2c94ff1 s3:smb2 fix smbd crash on premature end of smb2 conn (Bug 8286) from 1c8690c s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 2c94ff10332f4be909a158329c41e2f5db035949 Author: Christian Ambach <a...@samba.org> Date: Mon Jul 4 17:55:54 2011 +0200 s3:smb2 fix smbd crash on premature end of smb2 conn (Bug 8286) when smbd tries to clean up locks after a premature end of a smb2 connection, lock_db has already been freed and so it crashes this patch changes the order in which items are freed so that lock_db is still around when it is needed ----------------------------------------------------------------------- Summary of changes: source3/smbd/server_exit.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c index a853c77..4c71d8f 100644 --- a/source3/smbd/server_exit.c +++ b/source3/smbd/server_exit.c @@ -152,9 +152,6 @@ static void exit_server_common(enum server_exit_reason how, rpc_lsarpc_shutdown(); } - locking_end(); - printing_end(); - /* * we need to force the order of freeing the following, * because smbd_msg_ctx is not a talloc child of smbd_server_conn. @@ -165,6 +162,9 @@ static void exit_server_common(enum server_exit_reason how, server_event_context_free(); TALLOC_FREE(smbd_memcache_ctx); + locking_end(); + printing_end(); + if (how != SERVER_EXIT_NORMAL) { DEBUGSEP(0); DEBUG(0,("Abnormal server exit: %s\n", -- Samba Shared Repository