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

Jeremy.

diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 60ec632b838939b5d103f89ced750a438155754a..2c0950de03a63b60d1439475d7e90bca9cc5a8db 100644 (file)
--- 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 788cd04c17d7274988213a464248e2f69124863f..8c287c9836ebad8878f1b3694985952777afc2f8 100644 (file)
--- 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,