r15943: Update misleading DEBUG statements and comments that refer to

open_file_shared.
(This used to be commit 784126edff942d1c2f79f7c9feb59980426f331e)

3 files changed, 7 insertions, 6 deletions

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index a532a90d0d..b536844319 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1116,7 +1116,7 @@ BOOL downgrade_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 /****************************************************************************
  Deal with the internal needs of setting the delete on close flag. Note that
  as the tdb locking is recursive, it is safe to call this from within 
- open_file_shared. JRA.
+ open_file_ntcreate. JRA.
 ****************************************************************************/
 
 NTSTATUS can_set_delete_on_close(files_struct *fsp, BOOL delete_on_close,
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 3cdc4997b2..e2a2543e30 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1704,8 +1704,9 @@ static NTSTATUS copy_internals(connection_struct *conn, char *oldname, char *new
 
 	close_ret = close_file(fsp2,NORMAL_CLOSE);
 
-	/* Grrr. We have to do this as open_file_shared1 adds aARCH when it
-	   creates the file. This isn't the correct thing to do in the copy case. JRA */
+	/* Grrr. We have to do this as open_file_ntcreate adds aARCH when it
+	   creates the file. This isn't the correct thing to do in the copy
+	   case. JRA */
 	file_set_dosmode(conn, newname, fattr, &sbuf2, True);
 
 	if (ret < (SMB_OFF_T)sbuf1.st_size) {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 3d537b2f39..f1d1b776dd 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -245,7 +245,7 @@ static BOOL open_file(files_struct *fsp,
 
 		/*
 		 * We can't actually truncate here as the file may be locked.
-		 * open_file_shared will take care of the truncate later. JRA.
+		 * open_file_ntcreate will take care of the truncate later. JRA.
 		 */
 
 		local_flags &= ~O_TRUNC;
@@ -1742,7 +1742,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
 			if (ret == -1 && errno == ENOSYS) {
 				errno = saved_errno; /* Ignore ENOSYS */
 			} else {
-				DEBUG(5, ("open_file_shared: reset "
+				DEBUG(5, ("open_file_ntcreate: reset "
 					  "attributes of file %s to 0%o\n",
 					fname, (unsigned int)new_unx_mode));
 				ret = 0; /* Don't do the fchmod below. */
@@ -1751,7 +1751,7 @@ files_struct *open_file_ntcreate(connection_struct *conn,
 
 		if ((ret == -1) &&
 		    (SMB_VFS_FCHMOD(fsp, fsp->fh->fd, new_unx_mode) == -1))
-			DEBUG(5, ("open_file_shared: failed to reset "
+			DEBUG(5, ("open_file_ntcreate: failed to reset "
 				  "attributes of file %s to 0%o\n",
 				fname, (unsigned int)new_unx_mode));
 	}