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/utils/net_rpc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index cafab87a96..d27545d1c6 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -3452,6 +3452,7 @@ static bool sync_files(struct copy_clistate *cp_clistate, const char *mask) { struct cli_state *targetcli; char *targetpath = NULL; + NTSTATUS status; DEBUG(3,("calling cli_list with mask: %s\n", mask)); @@ -3463,9 +3464,11 @@ static bool sync_files(struct copy_clistate *cp_clistate, const char *mask) return false; } - if (cli_list(targetcli, targetpath, cp_clistate->attribute, copy_fn, cp_clistate) == -1) { + status = cli_list(targetcli, targetpath, cp_clistate->attribute, + copy_fn, cp_clistate); + if (!NT_STATUS_IS_OK(status)) { d_fprintf(stderr, _("listing %s failed with error: %s\n"), - mask, cli_errstr(targetcli)); + mask, nt_errstr(status)); return false; } -- cgit