From 2d1d00bdd0f1acf66c6700488f4a3e3970b722a1 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 29 Nov 2017 13:16:43 -0800 Subject: [PATCH] s3: libsmb: Fix reversing of oldname/newname paths when creating a reparse point symlink on Windows from smbclient. This happened as smbd doesn't support reparse points so we couldn't test. This was the reverse of the (tested) symlink parameters in the unix extensions symlink command. Rename parameters to link_target instead of oldname so this is clearer. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13172 Signed-off-by: Jeremy Allison Reviewed-by: Volker Lendecke (cherry picked from commit abbc9b9ab793d22bca6a37828f4375ef38c56dd3) Autobuild-User(v4-7-test): Karolin Seeger Autobuild-Date(v4-7-test): Wed Dec 13 14:19:59 CET 2017 on sn-devel-144 --- source3/libsmb/clisymlink.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source3/libsmb/clisymlink.c b/source3/libsmb/clisymlink.c index 496e3e1d953..a52f6ff7f6d 100644 --- a/source3/libsmb/clisymlink.c +++ b/source3/libsmb/clisymlink.c @@ -31,7 +31,7 @@ struct cli_symlink_state { struct tevent_context *ev; struct cli_state *cli; - const char *oldpath; + const char *link_target; const char *newpath; uint32_t flags; @@ -49,7 +49,7 @@ static void cli_symlink_close_done(struct tevent_req *subreq); struct tevent_req *cli_symlink_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli, - const char *oldpath, + const char *link_target, const char *newpath, uint32_t flags) { @@ -62,12 +62,12 @@ struct tevent_req *cli_symlink_send(TALLOC_CTX *mem_ctx, } state->ev = ev; state->cli = cli; - state->oldpath = oldpath; + state->link_target = link_target; state->newpath = newpath; state->flags = flags; subreq = cli_ntcreate_send( - state, ev, cli, state->oldpath, 0, + state, ev, cli, state->newpath, 0, SYNCHRONIZE_ACCESS|DELETE_ACCESS| FILE_READ_ATTRIBUTES|FILE_WRITE_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_NONE, FILE_CREATE, @@ -102,7 +102,7 @@ static void cli_symlink_create_done(struct tevent_req *subreq) SCVAL(state->setup, 7, 0); /* IsFlags */ if (!symlink_reparse_buffer_marshall( - state->newpath, NULL, state->flags, state, + state->link_target, NULL, state->flags, state, &data, &data_len)) { tevent_req_oom(req); return; @@ -197,7 +197,7 @@ NTSTATUS cli_symlink_recv(struct tevent_req *req) return tevent_req_simple_recv_ntstatus(req); } -NTSTATUS cli_symlink(struct cli_state *cli, const char *oldname, +NTSTATUS cli_symlink(struct cli_state *cli, const char *link_target, const char *newname, uint32_t flags) { TALLOC_CTX *frame = talloc_stackframe(); @@ -213,7 +213,7 @@ NTSTATUS cli_symlink(struct cli_state *cli, const char *oldname, if (ev == NULL) { goto fail; } - req = cli_symlink_send(frame, ev, cli, oldname, newname, flags); + req = cli_symlink_send(frame, ev, cli, link_target, newname, flags); if (req == NULL) { goto fail; } -- 2.11.4.GIT