[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2671-g8dd833b
Jeremy Allison
jra at samba.org
Tue Jul 1 22:40:43 GMT 2008
The branch, v3-2-test has been updated
via 8dd833b908cc8d4c0aa34cdece014d0e160aaf9e (commit)
from 042c5008d8411f03980f967edb2f78d1a3262aed (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 8dd833b908cc8d4c0aa34cdece014d0e160aaf9e
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jul 1 15:40:07 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 2af4383..d6d26e4 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
More information about the samba-cvs
mailing list