sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

s3: Remove unix_convert handling from createfile implementations

Browse Source
This commit is contained in:
Tim Prouty 2009-06-05 20:24:17 -07:00
parent 6088e554f5
commit 2481d8dcd0
2 changed files with 8 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
source3/modules/onefs_open.c
View File

@ -2056,38 +2056,12 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
case_state = set_posix_case_semantics(talloc_tos(), conn);
}
/* Convert dos path to unix path if it hasn't already been done. */
if (create_file_flags & CFF_DOS_PATH) {
struct smb_filename *smb_fname = NULL;
char *converted_fname;
SET_STAT_INVALID(sbuf);
status = unix_convert(talloc_tos(), conn, fname, &smb_fname,
0);
if (!NT_STATUS_IS_OK(status)) {
goto fail;
}
status = get_full_smb_filename(talloc_tos(), smb_fname,
&converted_fname);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(smb_fname);
goto fail;
}
sbuf = smb_fname->st;
fname = converted_fname;
TALLOC_FREE(smb_fname);
if (psbuf != NULL) {
sbuf = *psbuf;
} else {
if (psbuf != NULL) {
sbuf = *psbuf;
} else {
if (SMB_VFS_STAT(conn, fname, &sbuf) == -1) {
SET_STAT_INVALID(sbuf);
}
if (SMB_VFS_STAT(conn, fname, &sbuf) == -1) {
SET_STAT_INVALID(sbuf);
}
}
TALLOC_FREE(case_state);

33
source3/smbd/open.c
View File

@ -3438,37 +3438,12 @@ NTSTATUS create_file_default(connection_struct *conn,
case_state = set_posix_case_semantics(talloc_tos(), conn);
}
if (create_file_flags & CFF_DOS_PATH) {
struct smb_filename *smb_fname = NULL;
char *converted_fname;
SET_STAT_INVALID(sbuf);
status = unix_convert(talloc_tos(), conn, fname, &smb_fname,
0);
if (!NT_STATUS_IS_OK(status)) {
goto fail;
}
status = get_full_smb_filename(talloc_tos(), smb_fname,
&converted_fname);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(smb_fname);
goto fail;
}
sbuf = smb_fname->st;
fname = converted_fname;
TALLOC_FREE(smb_fname);
if (psbuf != NULL) {
sbuf = *psbuf;
} else {
if (psbuf != NULL) {
sbuf = *psbuf;
} else {
if (SMB_VFS_STAT(conn, fname, &sbuf) == -1) {
SET_STAT_INVALID(sbuf);
}
if (SMB_VFS_STAT(conn, fname, &sbuf) == -1) {
SET_STAT_INVALID(sbuf);
}
}
TALLOC_FREE(case_state);