[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  940395d smbd: Fix a 100% loop at shutdown time
       via  02ff6ab srvsvc: Use a symbolic constant where we have one
      from  f387d9a ccan: Fix calling memset with zero length parameter

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


- Log -----------------------------------------------------------------
commit 940395d38bcc348eb5f1be7ba03cd554d9d3bc93
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 11 16:22:26 2013 +0200

    smbd: Fix a 100% loop at shutdown time
    
    In the destructor of fsp->aio_requests[0] we put another request into
    fsp->aio_requests[0]. Don't overwrite that with TALLOC_FREE.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jul 11 20:56:42 CEST 2013 on sn-devel-104

commit 02ff6ab5e778ceac30410136e622310b3a90e903
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 11 11:31:50 2013 +0200

    srvsvc: Use a symbolic constant where we have one
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c |    7 ++++++-
 source3/smbd/close.c                      |    7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 011d41f..655b0c7 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -301,7 +301,12 @@ static void init_srv_share_info_501(struct pipes_struct *p,
 	r->name		= net_name;
 	r->type		= get_share_type(snum);
 	r->comment	= remark ? remark : "";
-	r->csc_policy	= (lp_csc_policy(snum) << 4);
+
+	/*
+	 * According to [MS-SRVS] 2.2.4.25, the flags field is the same as in
+	 * level 1005.
+	 */
+	r->csc_policy	= (lp_csc_policy(snum) << SHARE_1005_CSC_POLICY_SHIFT);
 }
 
 /*******************************************************************
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 2bd588b..f341c72 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -640,9 +640,12 @@ static NTSTATUS close_normal_file(struct smb_request *req, files_struct *fsp,
 		while (fsp->num_aio_requests != 0) {
 			/*
 			 * The destructor of the req will remove
-			 * itself from the fsp
+			 * itself from the fsp.
+			 * Don't use TALLOC_FREE here, this will overwrite
+			 * what the destructor just wrote into
+			 * aio_requests[0].
 			 */
-			TALLOC_FREE(fsp->aio_requests[0]);
+			talloc_free(fsp->aio_requests[0]);
 		}
 	}
 


-- 
Samba Shared Repository