[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  ff48f7c s3: Attempt to fix the IRIX build
      from  97b7636 s3: Attempt to fix a ton of warnings on the build farm

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


- Log -----------------------------------------------------------------
commit ff48f7c00ce39057df48575fe0ceb28250069f67
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Oct 3 10:54:06 2010 +0200

    s3: Attempt to fix the IRIX build

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

Summary of changes:
 source3/smbd/oplock_irix.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index fadad54..518ea7e 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -182,7 +182,7 @@ static files_struct *irix_oplock_receive_message(struct kernel_oplocks *_ctx)
 
 	fileid = file_id_create_dev((SMB_DEV_T)os.os_dev,
 				    (SMB_INO_T)os.os_ino);
-	if ((fsp = file_find_di_first(fileid)) == NULL) {
+	if ((fsp = file_find_di_first(smbd_server_conn, fileid)) == NULL) {
 		DEBUG(0,("irix_oplock_receive_message: unable to find open "
 			 "file with dev = %x, inode = %.0f\n",
 			 (unsigned int)os.os_dev, (double)os.os_ino ));


-- 
Samba Shared Repository