Attachment 17468 Details for Bug 7701 – patch for master

[patch] patch for master

0001-s3-client-notice-some-errors.patch (text/plain), 1.61 KB, created by Douglas Bagnall on 2022-08-11 04:19:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Bagnall

Created: 2022-08-11 04:19:20 UTC

Size: 1.61 KB

patch

obsolete

>From 058cc287ff4ef4f419a5e47ac373b5f4e75e81b1 Mon Sep 17 00:00:00 2001
>From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Date: Thu, 11 Aug 2022 16:16:35 +1200
>Subject: [PATCH] s3/client: notice some errors
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=7701
>
>Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
>Pair-programmed-with: Brandon Wang <Brandon.Wang@chn.fujixerox.com>
>---
> source3/client/client.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/source3/client/client.c b/source3/client/client.c
>index 651da5fbf7a..9929fe75c07 100644
>--- a/source3/client/client.c
>+++ b/source3/client/client.c
>@@ -1485,6 +1485,7 @@ static int cmd_mkdir(void)
> 	char *buf = NULL;
> 	struct cli_credentials *creds = samba_cmdline_get_creds();
>         NTSTATUS status;
>+	bool ok;
> 
> 	mask = talloc_strdup(ctx, client_get_cur_dir());
> 	if (!mask) {
>@@ -1539,7 +1540,10 @@ static int cmd_mkdir(void)
> 				return 1;
> 			}
> 			if (!NT_STATUS_IS_OK(cli_chkpath(targetcli, ddir2))) {
>-				do_mkdir(ddir2);
>+				ok = do_mkdir(ddir2);
>+				if(! ok){
>+					return 1;
>+				}
> 			}
> 			ddir2 = talloc_asprintf_append(ddir2, "%s", CLI_DIRSEP_STR);
> 			if (!ddir2) {
>@@ -1548,7 +1552,10 @@ static int cmd_mkdir(void)
> 			p = strtok_r(NULL, "/\\", &saveptr);
> 		}
> 	} else {
>-		do_mkdir(mask);
>+		ok = do_mkdir(ddir2);
>+		if(! ok){
>+			return 1;
>+		}
> 	}
> 
> 	return 0;
>@@ -2808,6 +2815,7 @@ static int cmd_posix_encrypt(void)
> 	talloc_unlink(ctx, lcreds);
> 	if (!NT_STATUS_IS_OK(status)) {
> 		d_printf("posix_encrypt failed with error %s\n", nt_errstr(status));
>+		return 1;
> 	} else {
> 		bool ok;
> 
>-- 
>2.25.1
>

Actions: View

Attachments on bug 7701: 6038 | 6047 | 17468