Fix wkssvc callers.

Guenther
(This used to be commit b734cd8aab163d794b969c4e1e721e81a8b4d44c)

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index f6944e4b1f59189490a44a262412f9df5fcbf76d..210763174e76c009d23d4d69ad3e80e6e752e3c4 100644 (file)
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -89,14 +89,12 @@ WERROR NetJoinDomain(const char *server_name,
                                               server_name, domain_name,
                                               account_ou, Account,
                                               &encrypted_password,
-                                              join_flags);
+                                              join_flags, &werr);
        if (!NT_STATUS_IS_OK(status)) {
                werr = ntstatus_to_werror(status);
                goto done;
        }
 
-       werr = WERR_OK;
-
  done:
        if (cli) {
                cli_set_timeout(cli, old_timeout);
@@ -166,14 +164,13 @@ WERROR NetUnjoinDomain(const char *server_name,
                                                 server_name,
                                                 account,
                                                 &encrypted_password,
-                                                unjoin_flags);
+                                                unjoin_flags,
+                                                &werr);
        if (!NT_STATUS_IS_OK(status)) {
                werr = ntstatus_to_werror(status);
                goto done;
        }
 
-       werr = WERR_OK;
-
  done:
        if (cli) {
                cli_set_timeout(cli, old_timeout);

diff --git a/source3/rpcclient/cmd_wkssvc.c b/source3/rpcclient/cmd_wkssvc.c
index 4f4c364ea262cf233a7ae4f23a8a4ca89ad1a607..f3ff8113e930c587517023e22819e660bf70947f 100644 (file)
--- a/source3/rpcclient/cmd_wkssvc.c
+++ b/source3/rpcclient/cmd_wkssvc.c
@@ -27,6 +27,7 @@ static WERROR cmd_wkssvc_wkstagetinfo(struct rpc_pipe_client *cli,
                                      const char **argv)
 {
        NTSTATUS status;
+       WERROR werr;
        uint32_t level = 100;
        union wkssvc_NetWkstaInfo info;
        const char *server_name;
@@ -36,12 +37,13 @@ static WERROR cmd_wkssvc_wkstagetinfo(struct rpc_pipe_client *cli,
        status = rpccli_wkssvc_NetWkstaGetInfo(cli, mem_ctx,
                                               server_name,
                                               level,
-                                              &info);
+                                              &info,
+                                              &werr);
        if (!NT_STATUS_IS_OK(status)) {
                return ntstatus_to_werror(status);
        }
 
-       return WERR_OK;
+       return werr;
 }
 
 struct cmd_set wkssvc_commands[] = {