diff options
| -rw-r--r-- | source3/libsmb/clientgen.c | 7 | ||||
| -rw-r--r-- | source3/smbd/oplock_irix.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 60ec632b83..2c0950de03 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/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/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c index 788cd04c17..8c287c9836 100644 --- a/source3/smbd/oplock_irix.c +++ b/source3/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, |