[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-922-gef75dcc

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  ef75dcc9ffda85d77c8f22d0db702efbf8e642ed (commit)
       via  7fb858b350856d626fed6f062029fcf09b8251e2 (commit)
      from  51448a9dca95de9d35dd8eea68fde2554cb69921 (commit)

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


- Log -----------------------------------------------------------------
commit ef75dcc9ffda85d77c8f22d0db702efbf8e642ed
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Dec 27 21:30:15 2007 +0100

    Remove a silly static

commit 7fb858b350856d626fed6f062029fcf09b8251e2
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Dec 27 19:56:44 2007 +0100

    Fix the build

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

Summary of changes:
 source/rpc_server/srv_srvsvc_nt.c |   12 ++++++------
 source/smbd/aio.c                 |    5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index 3cc2472..842a28c 100644
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/rpc_server/srv_srvsvc_nt.c
@@ -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;
 }
diff --git a/source/smbd/aio.c b/source/smbd/aio.c
index f13393b..a439c3a 100644
--- a/source/smbd/aio.c
+++ b/source/smbd/aio.c
@@ -496,7 +496,7 @@ static int handle_aio_write_complete(struct aio_extra *aio_ex)
 		}
 
 		ret = errno;
-		ERROR_BOTH(ERRHRD, ERRdiskfull, map_nt_error_from_unix(ret));
+		ERROR_BOTH(map_nt_error_from_unix(ret), ERRHRD, ERRdiskfull);
 		srv_set_message(inbuf,outbuf,0,0,true);
         } else {
 		bool write_through = BITSETW(aio_ex->inbuf+smb_vwv7,0);
@@ -514,7 +514,8 @@ static int handle_aio_write_complete(struct aio_extra *aio_ex)
 		status = sync_file(fsp->conn,fsp, write_through);
 		if (!NT_STATUS_IS_OK(status)) {
 			ret = errno;
-			ERROR_BOTH(ERRHRD, ERRdiskfull, map_nt_error_from_unix(ret));
+			ERROR_BOTH(map_nt_error_from_unix(ret),
+				   ERRHRD, ERRdiskfull);
 			srv_set_message(inbuf,outbuf,0,0,true);
                 	DEBUG(5,("handle_aio_write: sync_file for %s returned %s\n",
 				fsp->fsp_name, nt_errstr(status) ));


-- 
Samba Shared Repository