Merge NTSTATUS vs WERROR return for cli_srvsvc_net_srv_get_info()

diff --git a/source/rpc_client/cli_srvsvc.c b/source/rpc_client/cli_srvsvc.c
index 1bdd19620b4c4eb57d334c35236865982d9f19a4..b6c6b377ff372433231453b8acecde27e4a5ad4f 100644 (file)
--- a/source/rpc_client/cli_srvsvc.c
+++ b/source/rpc_client/cli_srvsvc.c
@@ -23,14 +23,14 @@
 
 #include "includes.h"
 
-NTSTATUS cli_srvsvc_net_srv_get_info(struct cli_state *cli, 
-                                     TALLOC_CTX *mem_ctx,
-                                     uint32 switch_value, SRV_INFO_CTR *ctr)
+WERROR cli_srvsvc_net_srv_get_info(struct cli_state *cli, 
+                                  TALLOC_CTX *mem_ctx,
+                                  uint32 switch_value, SRV_INFO_CTR *ctr)
 {
        prs_struct qbuf, rbuf;
        SRV_Q_NET_SRV_GET_INFO q;
        SRV_R_NET_SRV_GET_INFO r;
-       NTSTATUS result;
+       WERROR result = W_ERROR(ERRgeneral);
 
        ZERO_STRUCT(q);
        ZERO_STRUCT(r);
@@ -47,21 +47,17 @@ NTSTATUS cli_srvsvc_net_srv_get_info(struct cli_state *cli,
        /* Marshall data and send request */
 
        if (!srv_io_q_net_srv_get_info("", &q, &qbuf, 0) ||
-           !rpc_api_pipe_req(cli, SRV_NET_SRV_GET_INFO, &qbuf, &rbuf)) {
-               result = NT_STATUS_UNSUCCESSFUL;
+           !rpc_api_pipe_req(cli, SRV_NET_SRV_GET_INFO, &qbuf, &rbuf))
                goto done;
-       }
 
        /* Unmarshall response */
 
        r.ctr = ctr;
 
-       if (!srv_io_r_net_srv_get_info("", &r, &rbuf, 0)) {
-               result = NT_STATUS_UNSUCCESSFUL;
+       if (!srv_io_r_net_srv_get_info("", &r, &rbuf, 0))
                goto done;
-       }
 
-       result = werror_to_ntstatus(r.status);
+       result = r.status;
 
  done:
        prs_mem_free(&qbuf);

diff --git a/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c
index 282cbb3b997ef0d8ec86858c7844babdc7ecbe70..10fdfd743744550bd12d88a6cd699ce8e3438d8a 100644 (file)
--- a/source/rpcclient/cmd_srvsvc.c
+++ b/source/rpcclient/cmd_srvsvc.c
@@ -179,14 +179,13 @@ static void display_srv_info_102(SRV_INFO_102 *sv102)
 }
 
 /* Server query info */
-
 static NTSTATUS cmd_srvsvc_srv_query_info(struct cli_state *cli, 
                                           TALLOC_CTX *mem_ctx,
                                           int argc, char **argv)
 {
        uint32 info_level = 101;
        SRV_INFO_CTR ctr;
-       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       WERROR result;
 
        if (argc > 2) {
                printf("Usage: %s [infolevel]\n", argv[0]);
@@ -199,7 +198,7 @@ static NTSTATUS cmd_srvsvc_srv_query_info(struct cli_state *cli,
        result = cli_srvsvc_net_srv_get_info(cli, mem_ctx, info_level,
                                             &ctr);
 
-       if (!NT_STATUS_IS_OK(result)) {
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
@@ -218,7 +217,7 @@ static NTSTATUS cmd_srvsvc_srv_query_info(struct cli_state *cli,
        }
 
  done:
-       return result;
+       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
 static void display_share_info_1(SRV_SHARE_INFO_1 *info1)