summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-11 10:49:26 +0100
committerVolker Lendecke <vl@samba.org>2007-12-11 16:16:54 +0100
commit3063f85a72e77d0b7dab66882cf08a45e1db539d (patch)
tree89fede2c1ecc523883983e5b2bc0107104d2f1d4 /source3
parent0ac113e5a2c1de27a9a33f75821c4fac94ff8731 (diff)
downloadsamba-3063f85a72e77d0b7dab66882cf08a45e1db539d.tar.gz
samba-3063f85a72e77d0b7dab66882cf08a45e1db539d.tar.bz2
samba-3063f85a72e77d0b7dab66882cf08a45e1db539d.zip
Move more stuff out of the way
(This used to be commit ae422fce01cd7520d6dd72e08719a5cd003cb640)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/open.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 4798563721..007b64abf2 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2484,13 +2484,6 @@ NTSTATUS create_file(connection_struct *conn,
(unsigned int)root_dir_fid,
ea_list, sd, fname));
- SET_STAT_INVALID(sbuf);
-
- if (create_options & FILE_OPEN_BY_FILE_ID) {
- status = NT_STATUS_NOT_SUPPORTED;
- goto fail;
- }
-
/*
* Get the file name.
*/
@@ -2641,6 +2634,8 @@ NTSTATUS create_file(connection_struct *conn,
{
char *converted_fname;
+ SET_STAT_INVALID(sbuf);
+
status = unix_convert(talloc_tos(), conn, fname, False,
&converted_fname, NULL, &sbuf);
if (!NT_STATUS_IS_OK(status)) {
@@ -2656,6 +2651,11 @@ NTSTATUS create_file(connection_struct *conn,
goto fail;
}
+ if (create_options & FILE_OPEN_BY_FILE_ID) {
+ status = NT_STATUS_NOT_SUPPORTED;
+ goto fail;
+ }
+
if (req == NULL) {
oplock_request |= INTERNAL_OPEN_ONLY;
}