[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3054-gd85cbdb

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  d85cbdbe296ec6de5bdbd66a90ca41345f55c837 (commit)
      from  d89f9d404f478fc9887bb6e67ce28a61464bcf93 (commit)

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


- Log -----------------------------------------------------------------
commit d85cbdbe296ec6de5bdbd66a90ca41345f55c837
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jul 1 15:39:41 2008 -0700

    Two more fixes from Jim Brown <jim.brown at miami.edu> for SGI compiler warnings.
    Jeremy.

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

Summary of changes:
 source/libsmb/clientgen.c |    7 ++++++-
 source/smbd/oplock_irix.c |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 60ec632..2c0950d 100644
--- a/source/libsmb/clientgen.c
+++ b/source/libsmb/clientgen.c
@@ -97,7 +97,12 @@ static ssize_t client_receive_smb(struct cli_state *cli, size_t maxlen)
 			return -1;
 		}
 
-		if (len < 0) {
+		/*
+		 * I don't believe len can be < 0 with NT_STATUS_OK
+		 * returned above, but this check doesn't hurt. JRA.
+		 */
+
+		if ((ssize_t)len < 0) {
 			return len;
 		}
 
diff --git a/source/smbd/oplock_irix.c b/source/smbd/oplock_irix.c
index 788cd04..8c287c9 100644
--- a/source/smbd/oplock_irix.c
+++ b/source/smbd/oplock_irix.c
@@ -184,7 +184,7 @@ static bool irix_set_kernel_oplock(files_struct *fsp, int oplock_type)
 				 strerror(errno) ));
 		} else {
 			DEBUG(5,("irix_set_kernel_oplock: Refused oplock on "
-				 "file %s, fd = %d, file_id = 5s, "
+				 "file %s, fd = %d, file_id = %s, "
 				 "gen_id = %ul. Another process had the file "
 				 "open.\n",
 				 fsp->fsp_name, fsp->fh->fd,


-- 
Samba Shared Repository