locking.c: Fixed incorrect parameter count in debug statements. May explain

           solaris crashes.
reply.c: Added NT specific error code. Put oplock break code in correct place
         in reply_lockingX.
server.c: Removed unneeded error mapping stuff.
          Fixed race condition in oplock code.
trans2.c: Added NT specific error code.
util.c: Added paranoia check in interpret_addr. Some core dumps
        reported here. Upped fcntl debug levels.

Andrew. Please check the NT specific error code handling (search
for the string "/* Ugly - NT specific hack - but needed (JRA) */",
this makes NT and 95 clients behave correctly here - please check
your Visual Basic apps with this code.

Jeremy (jallison@whistle.com).
(This used to be commit 97ee4a5f69bd9cfbbc8710a1a04d80db0ee40104)

1 files changed, 5 insertions, 6 deletions

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 693beb7432..834f3e5658 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -206,7 +206,7 @@ file dev = %d, ino = %d in hash_bucket %d\n", dev, inode, hash_entry));
   {
     DEBUG(0,("ERROR:get_share_modes (FAST_SHARE_MODES): Deleting old share mode \
 record due to old locking version %d for file dev = %d, inode = %d in hash \
-bucket %d",file_scanner_p->locking_version, dev, inode, hash_entry));
+bucket %d\n", file_scanner_p->locking_version, dev, inode, hash_entry));
     if(file_prev_p == file_scanner_p)
       mode_array[hash_entry] = file_scanner_p->next_offset;
     else
@@ -270,7 +270,7 @@ for dev = %d, ino = %d, hashbucket %d\n", file_scanner_p->num_share_mode_entries
 
       DEBUG(0,("get_share_modes (FAST_SHARE_MODES): process %d no longer exists and \
 it left a share mode entry with mode 0x%X for file dev = %d, ino = %d in hash \
-bucket (number of entries now = %d)\n", 
+bucket %d (number of entries now = %d)\n", 
             pid, entry_scanner_p->share_mode, dev, inode, hash_entry,
             file_scanner_p->num_share_mode_entries));
 
@@ -316,8 +316,7 @@ hash bucket %d has a share mode record but no entries - deleting\n",
   }
 
   DEBUG(5,("get_share_modes (FAST_SHARE_MODES): file with dev %d, inode %d in \
-hash bucket %d returning %d entries\n", dev, inode, hash_entry,
-                         num_entries_copied));
+hash bucket %d returning %d entries\n", dev, inode, hash_entry, num_entries_copied));
 
   return(num_entries_copied);
 }  
@@ -878,8 +877,8 @@ for share file %s (%s)\n", fname, strerror(errno)));
   if (IVAL(buf,SMF_VERSION_OFFSET) != LOCKING_VERSION) {
     DEBUG(0,("ERROR: read_share_file: share file %s has incorrect \
 locking version (was %d, should be %d).\n",fname, 
-           IVAL(buf,SMF_VERSION_OFFSET), LOCKING_VERSION));
-    if(buf)
+                    IVAL(buf,SMF_VERSION_OFFSET), LOCKING_VERSION));
+   if(buf)
       free(buf);
     delete_share_file(cnum, fname);
     return -1;