summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-05-29 23:54:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:14 -0500
commit0a1ca7fa3d19f46c4bcb0c80c78a619c90fe5f2a (patch)
tree2c8598bfcd3f01ebf2eeda732dbfefd01186f933 /source3/smbd
parent803eed10629364445524163d47786431fd91b1f4 (diff)
downloadsamba-0a1ca7fa3d19f46c4bcb0c80c78a619c90fe5f2a.tar.gz
samba-0a1ca7fa3d19f46c4bcb0c80c78a619c90fe5f2a.tar.bz2
samba-0a1ca7fa3d19f46c4bcb0c80c78a619c90fe5f2a.zip
r15943: Update misleading DEBUG statements and comments that refer to
open_file_shared. (This used to be commit 784126edff942d1c2f79f7c9feb59980426f331e)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/nttrans.c5
-rw-r--r--source3/smbd/open.c6
2 files changed, 6 insertions, 5 deletions
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));
}