diff options
author | Volker Lendecke <vlendec@samba.org> | 2006-12-27 10:57:59 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:43 -0500 |
commit | 8cd9636458e175d2e1b63a5211423cec04a6ce91 (patch) | |
tree | 47ab7db144234fa02a3484cc21c7ccdd44f5f5a6 /source3/smbd/nttrans.c | |
parent | 9f2807fc93bf25bbc06ddedebd0a1d17993444ec (diff) | |
download | samba-8cd9636458e175d2e1b63a5211423cec04a6ce91.tar.gz samba-8cd9636458e175d2e1b63a5211423cec04a6ce91.tar.bz2 samba-8cd9636458e175d2e1b63a5211423cec04a6ce91.zip |
r20356: Consolidate the calls to parent_dirname() per open to one.
This involved passing the dirname as argument to a few routines instead of
calling parent_dirname() deep down.
Volker
(This used to be commit 7977fd78652897bb7d4db1c21c5749043428f911)
Diffstat (limited to 'source3/smbd/nttrans.c')
-rw-r--r-- | source3/smbd/nttrans.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 260a640dae..377ddbeec3 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1697,7 +1697,8 @@ static NTSTATUS copy_internals(connection_struct *conn, char *oldname, char *new /* 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); + file_set_dosmode(conn, newname, fattr, &sbuf2, + parent_dirname(newname)); if (ret < (SMB_OFF_T)sbuf1.st_size) { return NT_STATUS_DISK_FULL; |