diff options
| author | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-06-08 20:07:34 +0000 |
| commit | 3a5cc58fde0d53d83d46e37f80670ad6bd67f892 (patch) | |
| tree | af90a90140ba6578e973247176d40c6af54a167a /source/smbd/nttrans.c | |
| parent | a1b3f2f9bac039395fa20f0be779367f7e23400a (diff) | |
| download | samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.gz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.tar.xz samba-3a5cc58fde0d53d83d46e37f80670ad6bd67f892.zip | |
r16104: Set version to 3.0.23rc2
Bring release tree up to current 3.0 tree
(svn merge -r15845:16103 $SVNURL/branches/SAMBA_3_0)
Diffstat (limited to 'source/smbd/nttrans.c')
| -rw-r--r-- | source/smbd/nttrans.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c index 3cdc4997b23..5d19d496fd9 100644 --- a/source/smbd/nttrans.c +++ b/source/smbd/nttrans.c @@ -1652,11 +1652,11 @@ static NTSTATUS copy_internals(connection_struct *conn, char *oldname, char *new fsp1 = open_file_ntcreate(conn,oldname,&sbuf1, FILE_READ_DATA, /* Read-only. */ - 0, /* No sharing. */ + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, 0, /* No create options. */ FILE_ATTRIBUTE_NORMAL, - INTERNAL_OPEN_ONLY, + NO_OPLOCK, &info); if (!fsp1) { @@ -1669,12 +1669,12 @@ static NTSTATUS copy_internals(connection_struct *conn, char *oldname, char *new } fsp2 = open_file_ntcreate(conn,newname,&sbuf2, - FILE_WRITE_DATA, /* Read-only. */ - 0, /* No sharing. */ + FILE_WRITE_DATA, /* Write-only. */ + FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_CREATE, 0, /* No create options. */ fattr, - INTERNAL_OPEN_ONLY, + NO_OPLOCK, &info); if (!fsp2) { @@ -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) { |