1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00

rpcclient: abort shadow-copy set on commit failure

Use similar behaviour to the diskshadow.exe FSRVP client, which aborts
the shadow-copy set if it receives a failed commit response.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Apr  1 00:54:06 CEST 2014 on sn-devel-104
This commit is contained in:
David Disseldorp 2014-03-29 02:18:20 +01:00 committed by Jeremy Allison
parent cbc6082ec7
commit d550acf24a

View File

@ -263,6 +263,24 @@ static NTSTATUS cmd_fss_create_expose_parse(TALLOC_CTX *mem_ctx, int argc,
return NT_STATUS_OK;
}
static NTSTATUS cmd_fss_abort(TALLOC_CTX *mem_ctx,
struct dcerpc_binding_handle *b,
struct GUID *sc_set_id)
{
NTSTATUS status;
struct fss_AbortShadowCopySet r_scset_abort;
ZERO_STRUCT(r_scset_abort);
r_scset_abort.in.ShadowCopySetId = *sc_set_id;
status = dcerpc_fss_AbortShadowCopySet_r(b, mem_ctx, &r_scset_abort);
if (!NT_STATUS_IS_OK(status) || (r_scset_abort.out.result != 0)) {
DEBUG(0, ("AbortShadowCopySet failed: %s result: 0x%x\n",
nt_errstr(status), r_scset_abort.out.result));
return NT_STATUS_UNSUCCESSFUL;
}
return NT_STATUS_OK;
}
static NTSTATUS cmd_fss_create_expose(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx, int argc,
const char **argv)
@ -356,7 +374,7 @@ static NTSTATUS cmd_fss_create_expose(struct rpc_pipe_client *cli,
if (!NT_STATUS_IS_OK(status) || (r_scset_add.out.result != 0)) {
DEBUG(0, ("AddToShadowCopySet failed: %s result: 0x%x\n",
nt_errstr(status), r_scset_add.out.result));
goto err_out;
goto err_sc_set_abort;
}
printf("%s(%s): %s shadow-copy added to set\n",
GUID_string(tmp_ctx, r_scset_start.out.pShadowCopySetId),
@ -374,7 +392,7 @@ static NTSTATUS cmd_fss_create_expose(struct rpc_pipe_client *cli,
if (!NT_STATUS_IS_OK(status) || (r_scset_prep.out.result != 0)) {
DEBUG(0, ("PrepareShadowCopySet failed: %s result: 0x%x\n",
nt_errstr(status), r_scset_prep.out.result));
goto err_out;
goto err_sc_set_abort;
}
printf("%s: prepare completed in %llu secs\n",
GUID_string(tmp_ctx, r_scset_start.out.pShadowCopySetId),
@ -388,7 +406,7 @@ static NTSTATUS cmd_fss_create_expose(struct rpc_pipe_client *cli,
if (!NT_STATUS_IS_OK(status) || (r_scset_commit.out.result != 0)) {
DEBUG(0, ("CommitShadowCopySet failed: %s result: 0x%x\n",
nt_errstr(status), r_scset_commit.out.result));
goto err_out;
goto err_sc_set_abort;
}
printf("%s: commit completed in %llu secs\n",
GUID_string(tmp_ctx, r_scset_start.out.pShadowCopySetId),
@ -424,6 +442,11 @@ static NTSTATUS cmd_fss_create_expose(struct rpc_pipe_client *cli,
map->ShadowCopyShareName, map->ShareNameUNC);
}
talloc_free(tmp_ctx);
return NT_STATUS_OK;
err_sc_set_abort:
cmd_fss_abort(tmp_ctx, b, r_scset_start.out.pShadowCopySetId);
err_out:
talloc_free(tmp_ctx);
return status;