fixed formatting to make the code vaguely readable. It's still a dogs

breakfast, but at least you can follow the indents
(This used to be commit 9955ea0aaa299c6c946b4e7b7e98017c39b60bc8)

1 files changed, 143 insertions, 142 deletions

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 6a1eac7602..145d12e3f3 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -444,151 +444,151 @@ static int open_mode_check(connection_struct *conn, const char *fname, SMB_DEV_T
 							SMB_INO_T inode, int share_mode, int *p_flags, int *p_oplock_request,
 							BOOL *p_all_current_opens_are_level_II)
 {
-  int i;
-  int num_share_modes;
-  int oplock_contention_count = 0;
-  share_mode_entry *old_shares = 0;
-  BOOL fcbopen = False;
-  BOOL broke_oplock;	
-
-  if(GET_OPEN_MODE(share_mode) == DOS_OPEN_FCB)
-    fcbopen = True;
-
-  num_share_modes = get_share_modes(conn, dev, inode, &old_shares);
-
-  if(num_share_modes == 0)
-    return 0;
-
-  /*
-   * Check if the share modes will give us access.
-   */
-
-  do {
-    share_mode_entry broken_entry;
-
-    broke_oplock = False;
-    *p_all_current_opens_are_level_II = True;
-
-    for(i = 0; i < num_share_modes; i++) {
-      share_mode_entry *share_entry = &old_shares[i];
-
-      /* 
-       * By observation of NetBench, oplocks are broken *before* share
-       * modes are checked. This allows a file to be closed by the client
-       * if the share mode would deny access and the client has an oplock. 
-       * Check if someone has an oplock on this file. If so we must break 
-       * it before continuing. 
-       */
-
-      if((*p_oplock_request && EXCLUSIVE_OPLOCK_TYPE(share_entry->op_type)) ||
-         (!*p_oplock_request && (share_entry->op_type != NO_OPLOCK))) {
-
-        BOOL opb_ret;
+	int i;
+	int num_share_modes;
+	int oplock_contention_count = 0;
+	share_mode_entry *old_shares = 0;
+	BOOL fcbopen = False;
+	BOOL broke_oplock;	
+	
+	if(GET_OPEN_MODE(share_mode) == DOS_OPEN_FCB)
+		fcbopen = True;
+	
+	num_share_modes = get_share_modes(conn, dev, inode, &old_shares);
+	
+	if(num_share_modes == 0)
+		return 0;
+	
+	/*
+	 * Check if the share modes will give us access.
+	 */
+	
+	do {
+		share_mode_entry broken_entry;
+		
+		broke_oplock = False;
+		*p_all_current_opens_are_level_II = True;
+		
+		for(i = 0; i < num_share_modes; i++) {
+			share_mode_entry *share_entry = &old_shares[i];
+			
+			/* 
+			 * By observation of NetBench, oplocks are broken *before* share
+			 * modes are checked. This allows a file to be closed by the client
+			 * if the share mode would deny access and the client has an oplock. 
+			 * Check if someone has an oplock on this file. If so we must break 
+			 * it before continuing. 
+			 */
+			
+			if((*p_oplock_request && EXCLUSIVE_OPLOCK_TYPE(share_entry->op_type)) ||
+			   (!*p_oplock_request && (share_entry->op_type != NO_OPLOCK))) {
+				
+				BOOL opb_ret;
 
-        DEBUG(5,("open_mode_check: oplock_request = %d, breaking oplock (%x) on file %s, \
+				DEBUG(5,("open_mode_check: oplock_request = %d, breaking oplock (%x) on file %s, \
 dev = %x, inode = %.0f\n", *p_oplock_request, share_entry->op_type, fname, (unsigned int)dev, (double)inode));
-
-        /* Oplock break - unlock to request it. */
-        unlock_share_entry(conn, dev, inode);
-
-        opb_ret = request_oplock_break(share_entry, dev, inode);
-
-        /* Now relock. */
-        lock_share_entry(conn, dev, inode);
-
-        if(opb_ret == False) {
-          free((char *)old_shares);
-          DEBUG(0,("open_mode_check: FAILED when breaking oplock (%x) on file %s, \
+				
+				/* Oplock break - unlock to request it. */
+				unlock_share_entry(conn, dev, inode);
+				
+				opb_ret = request_oplock_break(share_entry, dev, inode);
+				
+				/* Now relock. */
+				lock_share_entry(conn, dev, inode);
+				
+				if(opb_ret == False) {
+					free((char *)old_shares);
+					DEBUG(0,("open_mode_check: FAILED when breaking oplock (%x) on file %s, \
 dev = %x, inode = %.0f\n", old_shares[i].op_type, fname, (unsigned int)dev, (double)inode));
-          errno = EACCES;
-          unix_ERR_class = ERRDOS;
-          unix_ERR_code = ERRbadshare;
-          return -1;
-        }
-
-        broke_oplock = True;
-        broken_entry = *share_entry;
-        break;
-
-      } else if (!LEVEL_II_OPLOCK_TYPE(share_entry->op_type)) {
-        *p_all_current_opens_are_level_II = False;
-      }
-
-      /* someone else has a share lock on it, check to see 
-         if we can too */
-
-      if(check_share_mode(share_entry, share_mode, fname, fcbopen, p_flags) == False) {
-        free((char *)old_shares);
-        errno = EACCES;
-        return -1;
-      }
-
-    } /* end for */
-
-    if(broke_oplock) {
-      free((char *)old_shares);
-      num_share_modes = get_share_modes(conn, dev, inode, &old_shares);
-      oplock_contention_count++;
-
-      /* Paranoia check that this is no longer an exlusive entry. */
-      for(i = 0; i < num_share_modes; i++) {
-        share_mode_entry *share_entry = &old_shares[i];
-
-        if (share_modes_identical(&broken_entry, share_entry) && 
-		EXCLUSIVE_OPLOCK_TYPE(share_entry->op_type) ) {
-
-          /*
-           * This should not happen. The target left this oplock
-           * as exlusive.... The process *must* be dead.... 
-           */
-
-          DEBUG(0,("open_mode_check: exlusive oplock left by process %d after break ! For file %s, \
+					errno = EACCES;
+					unix_ERR_class = ERRDOS;
+					unix_ERR_code = ERRbadshare;
+					return -1;
+				}
+				
+				broke_oplock = True;
+				broken_entry = *share_entry;
+				break;
+				
+			} else if (!LEVEL_II_OPLOCK_TYPE(share_entry->op_type)) {
+				*p_all_current_opens_are_level_II = False;
+			}
+			
+			/* someone else has a share lock on it, check to see 
+			   if we can too */
+			
+			if(check_share_mode(share_entry, share_mode, fname, fcbopen, p_flags) == False) {
+				free((char *)old_shares);
+				errno = EACCES;
+				return -1;
+			}
+			
+		} /* end for */
+		
+		if(broke_oplock) {
+			free((char *)old_shares);
+			num_share_modes = get_share_modes(conn, dev, inode, &old_shares);
+			oplock_contention_count++;
+			
+			/* Paranoia check that this is no longer an exlusive entry. */
+			for(i = 0; i < num_share_modes; i++) {
+				share_mode_entry *share_entry = &old_shares[i];
+				
+				if (share_modes_identical(&broken_entry, share_entry) && 
+				    EXCLUSIVE_OPLOCK_TYPE(share_entry->op_type) ) {
+					
+					/*
+					 * This should not happen. The target left this oplock
+					 * as exlusive.... The process *must* be dead.... 
+					 */
+					
+					DEBUG(0,("open_mode_check: exlusive oplock left by process %d after break ! For file %s, \
 dev = %x, inode = %.0f. Deleting it to continue...\n", (int)broken_entry.pid, fname, (unsigned int)dev, (double)inode));
-
-          if (process_exists(broken_entry.pid)) {
-            pstring errmsg;
-            slprintf(errmsg, sizeof(errmsg)-1, 
-                 "open_mode_check: Existant process %d left active oplock.\n",
-                 broken_entry.pid );
-            smb_panic(errmsg);
-          }
-
-          if (del_share_entry(dev, inode, &broken_entry, NULL) == -1) {
-            errno = EACCES;
-            unix_ERR_class = ERRDOS;
-            unix_ERR_code = ERRbadshare;
-            return -1;
-          }
-
-          /*
-           * We must reload the share modes after deleting the 
-           * other process's entry.
-           */
-
-          free((char *)old_shares);
-          num_share_modes = get_share_modes(conn, dev, inode, &old_shares);
-          break;
-        }
-      } /* end for paranoia... */
-    } /* end if broke_oplock */
-
-  } while(broke_oplock);
-
-  if(old_shares != 0)
-    free((char *)old_shares);
-
-  /*
-   * Refuse to grant an oplock in case the contention limit is
-   * reached when going through the lock list multiple times.
-   */
-
-  if(oplock_contention_count >= lp_oplock_contention_limit(SNUM(conn))) {
-    *p_oplock_request = 0;
-    DEBUG(4,("open_mode_check: oplock contention = %d. Not granting oplock.\n",
-          oplock_contention_count ));
-  }
-
-  return num_share_modes;
+					
+					if (process_exists(broken_entry.pid)) {
+						pstring errmsg;
+						slprintf(errmsg, sizeof(errmsg)-1, 
+							 "open_mode_check: Existant process %d left active oplock.\n",
+							 broken_entry.pid );
+						smb_panic(errmsg);
+					}
+					
+					if (del_share_entry(dev, inode, &broken_entry, NULL) == -1) {
+						errno = EACCES;
+						unix_ERR_class = ERRDOS;
+						unix_ERR_code = ERRbadshare;
+						return -1;
+					}
+					
+					/*
+					 * We must reload the share modes after deleting the 
+					 * other process's entry.
+					 */
+					
+					free((char *)old_shares);
+					num_share_modes = get_share_modes(conn, dev, inode, &old_shares);
+					break;
+				}
+			} /* end for paranoia... */
+		} /* end if broke_oplock */
+		
+	} while(broke_oplock);
+	
+	if(old_shares != 0)
+		free((char *)old_shares);
+	
+	/*
+	 * Refuse to grant an oplock in case the contention limit is
+	 * reached when going through the lock list multiple times.
+	 */
+	
+	if(oplock_contention_count >= lp_oplock_contention_limit(SNUM(conn))) {
+		*p_oplock_request = 0;
+		DEBUG(4,("open_mode_check: oplock contention = %d. Not granting oplock.\n",
+			 oplock_contention_count ));
+	}
+	
+	return num_share_modes;
 }
 
 /****************************************************************************
@@ -613,7 +613,8 @@ static void kernel_flock(files_struct *fsp, int deny_mode)
  that 
 ****************************************************************************/
 files_struct *open_file_shared(connection_struct *conn,char *fname, SMB_STRUCT_STAT *psbuf, 
-				int share_mode,int ofun, mode_t mode,int oplock_request, int *Access,int *action)
+			       int share_mode,int ofun, mode_t mode,int oplock_request, 
+			       int *Access,int *action)
 {
 	int flags=0;
 	int flags2=0;