diff options
| author | Jeremy Allison <jra@samba.org> | 1999-01-17 23:39:41 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1999-01-17 23:39:41 +0000 |
| commit | 16f3d0c764ba80d1b5b64a0b07bf24ee92be45be (patch) | |
| tree | 8f16c2e3cabaa1d06f82caf174987b72d67565ef | |
| parent | c1e7aeae70e18405fd5c5a56151fdc9cf3ce3484 (diff) | |
| download | samba-16f3d0c764ba80d1b5b64a0b07bf24ee92be45be.tar.gz samba-16f3d0c764ba80d1b5b64a0b07bf24ee92be45be.tar.xz samba-16f3d0c764ba80d1b5b64a0b07bf24ee92be45be.zip | |
As expected, people are complaining about the "32 bit lock message".
Moved the message so it's printed only in the case where we can't map the lock range.
Jeremy.
| -rw-r--r-- | source/smbd/reply.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/smbd/reply.c b/source/smbd/reply.c index dac8a5de980..293aff71f5d 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -3821,10 +3821,6 @@ SMB_OFF_T get_lock_count( char *data, int data_offset, BOOL large_file_format, B */ if(IVAL(data,SMB_LARGE_LKLEN_OFFSET_HIGH(data_offset)) != 0){ - DEBUG(1,("get_lock_count: Warning : a large file count (%x << 32 | %x) was sent and we don't \ -support large counts.\n", (unsigned int)IVAL(data,SMB_LARGE_LKLEN_OFFSET_HIGH(data_offset)), - (unsigned int)IVAL(data,SMB_LARGE_LKLEN_OFFSET_LOW(data_offset)) )); - /* * Before we error out, see if we can sensibly map the top bits * down to the lower bits - or lose the top bits if they are all 1's. @@ -3837,6 +3833,11 @@ support large counts.\n", (unsigned int)IVAL(data,SMB_LARGE_LKLEN_OFFSET_HIGH(da else if (IVAL(data,SMB_LARGE_LKLEN_OFFSET_HIGH(data_offset)) == (uint32)0xFFFFFFFF) count = (SMB_OFF_T)IVAL(data,SMB_LARGE_LKLEN_OFFSET_LOW(data_offset)); else { + + DEBUG(0,("get_lock_count: Error : a large file count (%x << 32 | %x) was sent and we don't \ +support large counts.\n", (unsigned int)IVAL(data,SMB_LARGE_LKLEN_OFFSET_HIGH(data_offset)), + (unsigned int)IVAL(data,SMB_LARGE_LKLEN_OFFSET_LOW(data_offset)) )); + *err = True; return (SMB_OFF_T)-1; } @@ -3873,10 +3874,6 @@ SMB_OFF_T get_lock_offset( char *data, int data_offset, BOOL large_file_format, */ if(IVAL(data,SMB_LARGE_LKOFF_OFFSET_HIGH(data_offset)) != 0){ - DEBUG(1,("get_lock_count: Warning : a large file offset (%x << 32 | %x) was sent and we don't \ -support large offsets.\n", (unsigned int)IVAL(data,SMB_LARGE_LKOFF_OFFSET_HIGH(data_offset)), - (unsigned int)IVAL(data,SMB_LARGE_LKOFF_OFFSET_LOW(data_offset)) )); - /* * Before we error out, see if we can sensibly map the top bits * down to the lower bits - or lose the top bits if they are all 1's. @@ -3889,6 +3886,11 @@ support large offsets.\n", (unsigned int)IVAL(data,SMB_LARGE_LKOFF_OFFSET_HIGH(d else if(IVAL(data,SMB_LARGE_LKOFF_OFFSET_HIGH(data_offset)) == (uint32)0xFFFFFFFF) offset = (SMB_OFF_T)IVAL(data,SMB_LARGE_LKOFF_OFFSET_LOW(data_offset)); else { + + DEBUG(0,("get_lock_count: Error : a large file offset (%x << 32 | %x) was sent and we don't \ +support large offsets.\n", (unsigned int)IVAL(data,SMB_LARGE_LKOFF_OFFSET_HIGH(data_offset)), + (unsigned int)IVAL(data,SMB_LARGE_LKOFF_OFFSET_LOW(data_offset)) )); + *err = True; return (SMB_OFF_T)-1; } |