From 867626abcad88b84684e9d328abf51d4f410a1cb Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 2 Aug 2010 19:22:22 +0200 Subject: s3: Convert cli_list() to return NTSTATUS If needed, the callback functions can count themselves --- source3/client/client.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'source3/client/client.c') diff --git a/source3/client/client.c b/source3/client/client.c index 7f804bf809..d4395818a7 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -865,10 +865,13 @@ void do_list(const char *mask, } else { /* check for dfs */ if (cli_resolve_path(ctx, "", auth_info, cli, mask, &targetcli, &targetpath)) { - if (cli_list(targetcli, targetpath, attribute, - do_list_helper, targetcli) == -1) { + NTSTATUS status; + + status = cli_list(targetcli, targetpath, attribute, + do_list_helper, targetcli); + if (!NT_STATUS_IS_OK(status)) { d_printf("%s listing %s\n", - cli_errstr(targetcli), targetpath); + nt_errstr(status), targetpath); } TALLOC_FREE(targetpath); } else { @@ -4281,6 +4284,7 @@ static char **remote_completion(const char *text, int len) struct cli_state *targetcli = NULL; int i; struct completion_remote info = { NULL, NULL, 1, 0, NULL, 0 }; + NTSTATUS status; /* can't have non-static initialisation on Sun CC, so do it at run time here */ @@ -4339,8 +4343,9 @@ static char **remote_completion(const char *text, int len) if (!cli_resolve_path(ctx, "", auth_info, cli, dirmask, &targetcli, &targetpath)) { goto cleanup; } - if (cli_list(targetcli, targetpath, aDIR | aSYSTEM | aHIDDEN, - completion_remote_filter, (void *)&info) < 0) { + status = cli_list(targetcli, targetpath, aDIR | aSYSTEM | aHIDDEN, + completion_remote_filter, (void *)&info); + if (!NT_STATUS_IS_OK(status)) { goto cleanup; } -- cgit