Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test

(This used to be commit 7dbfc7bdc65314466a83e8121b35c9bcb24b2631)

1 files changed, 10 insertions, 34 deletions

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 125ccb4752..1b877ee5b4 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -167,7 +167,7 @@ static void enum_file_fn( const struct share_mode_entry *e,
 	ZERO_STRUCT( fsp );
 	fsp.file_id = e->id;
 
-	if ( (brl = brl_get_locks(NULL,&fsp)) != NULL ) {
+	if ( (brl = brl_get_locks(talloc_tos(), &fsp)) != NULL ) {
 		num_locks = brl->num_locks;
 		TALLOC_FREE(brl);
 	}
@@ -870,13 +870,11 @@ static void init_srv_sess_info_0(pipes_struct *p, SRV_SESS_INFO_0 *ss0, uint32 *
 /*******************************************************************
 ********************************************************************/
 
-/* global needed to make use of the share_mode_forall() callback */
-static struct sess_file_count s_file_cnt;
-
 static void sess_file_fn( const struct share_mode_entry *e, 
-                          const char *sharepath, const char *fname, void *state )
+                          const char *sharepath, const char *fname,
+			  void *data )
 {
-	struct sess_file_count *sess = &s_file_cnt;
+	struct sess_file_count *sess = (struct sess_file_count *)data;
  
 	if ( procid_equal(&e->pid, &sess->pid) && (sess->uid == e->uid) ) {
 		sess->count++;
@@ -890,11 +888,13 @@ static void sess_file_fn( const struct share_mode_entry *e,
 
 static int net_count_files( uid_t uid, struct server_id pid )
 {
+	struct sess_file_count s_file_cnt;
+
 	s_file_cnt.count = 0;
 	s_file_cnt.uid = uid;
 	s_file_cnt.pid = pid;
 	
-	share_mode_forall( sess_file_fn, NULL );
+	share_mode_forall( sess_file_fn, &s_file_cnt );
 	
 	return s_file_cnt.count;
 }
@@ -2089,7 +2089,6 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
 	char *filename_in = NULL;
 	char *filename = NULL;
 	char *qualname = NULL;
-	files_struct *fsp = NULL;
 	SMB_STRUCT_STAT st;
 	NTSTATUS nt_status;
 	struct current_user user;
@@ -2149,25 +2148,7 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
 		goto error_exit;
 	}
 
-	nt_status = open_file_stat(conn, NULL, filename, &st, &fsp);
-	/* Perhaps it is a directory */
-	if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_IS_A_DIRECTORY)) {
-		nt_status = open_directory(conn, NULL, filename, &st,
-					   READ_CONTROL_ACCESS,
-					   FILE_SHARE_READ|FILE_SHARE_WRITE,
-					   FILE_OPEN,
-					   0,
-					   FILE_ATTRIBUTE_DIRECTORY,
-					   NULL, &fsp);
-	}
-
-	if (!NT_STATUS_IS_OK(nt_status)) {
-		DEBUG(3,("_srv_net_file_query_secdesc: Unable to open file %s\n", filename));
-		r_u->status = ntstatus_to_werror(nt_status);
-		goto error_exit;
-	}
-
-	nt_status = SMB_VFS_GET_NT_ACL(fsp, fsp->fsp_name,
+	nt_status = SMB_VFS_GET_NT_ACL(conn, filename,
 				       (OWNER_SECURITY_INFORMATION
 					|GROUP_SECURITY_INFORMATION
 					|DACL_SECURITY_INFORMATION), &psd);
@@ -2178,7 +2159,7 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
 		goto error_exit;
 	}
 
-	sd_size = sec_desc_size(psd);
+	sd_size = ndr_size_security_descriptor(psd, 0);
 
 	r_u->ptr_response = 1;
 	r_u->size_response = sd_size;
@@ -2186,19 +2167,14 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
 	r_u->size_secdesc = sd_size;
 	r_u->sec_desc = psd;
 
-	psd->dacl->revision = (uint16) NT4_ACL_REVISION;
+	psd->dacl->revision = NT4_ACL_REVISION;
 
-	close_file(fsp, NORMAL_CLOSE);
 	unbecome_user();
 	close_cnum(conn, user.vuid);
 	return r_u->status;
 
 error_exit:
 
-	if(fsp) {
-		close_file(fsp, NORMAL_CLOSE);
-	}
-
 	if (became_user)
 		unbecome_user();