sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: torture: In cmd_vfs, Move two more uses of OpenDir() -> OpenDir_nstatus().

Browse Source 
Now we can replace OpenDir() with OpenDir_ntatatus().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Jeremy Allison 2022-02-28 14:28:19 -08:00 committed by Volker Lendecke
parent e66be49a52
commit b331082b01
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/torture/cmd_vfs.c
View File

@ -149,6 +149,7 @@ static NTSTATUS cmd_disk_free(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int ar
static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
{
struct smb_filename *smb_fname = NULL;
NTSTATUS status;
if (argc != 2) {
printf("Usage: opendir <fname>\n");
@ -165,10 +166,17 @@ static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc
return NT_STATUS_NO_MEMORY;
}
vfs->currentdir = OpenDir(vfs->conn, vfs->conn, smb_fname, NULL, 0);
if (vfs->currentdir == NULL) {
printf("opendir error=%d (%s)\n", errno, strerror(errno));
status = OpenDir_ntstatus(vfs->conn,
vfs->conn,
smb_fname,
NULL,
0,
&vfs->currentdir);
if (!NT_STATUS_IS_OK(status)) {
int err = map_errno_from_nt_status(status);
printf("opendir error=%d (%s)\n", err, strerror(err));
TALLOC_FREE(smb_fname);
errno = err;
return NT_STATUS_UNSUCCESSFUL;
}
@ -2103,15 +2111,18 @@ static NTSTATUS cmd_translate_name(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
return NT_STATUS_NO_MEMORY;
}
vfs->currentdir = OpenDir(talloc_tos(),
status = OpenDir_ntstatus(vfs->conn,
vfs->conn,
smb_fname,
NULL,
0);
if (vfs->currentdir == NULL) {
0,
&vfs->currentdir);
if (!NT_STATUS_IS_OK(status)) {
int err = map_errno_from_nt_status(status);
DEBUG(0, ("cmd_translate_name: opendir error=%d (%s)\n",
errno, strerror(errno)));
err, strerror(err)));
TALLOC_FREE(smb_fname);
errno = err;
return NT_STATUS_UNSUCCESSFUL;
}
vfs->currentdir_offset = 0;