diff options
| author | Tim Potter <tpot@samba.org> | 2003-02-19 22:52:50 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-02-19 22:52:50 +0000 |
| commit | 7024ab8dcaab5ee590975fc8660dfd37e0b6a776 (patch) | |
| tree | c27df53b5a097b8cd8e6794c57c1676b42aec70e /source3/rpc_client/cli_srvsvc.c | |
| parent | aa1a248336776079ba305744d35f529bd17d2e94 (diff) | |
| download | samba-7024ab8dcaab5ee590975fc8660dfd37e0b6a776.tar.gz samba-7024ab8dcaab5ee590975fc8660dfd37e0b6a776.tar.bz2 samba-7024ab8dcaab5ee590975fc8660dfd37e0b6a776.zip | |
Merge NTSTATUS vs WERROR return for cli_srvsvc_net_srv_get_info()
(This used to be commit 7edaf937963fa1d0f06343969b46ed6e4f39a6ea)
Diffstat (limited to 'source3/rpc_client/cli_srvsvc.c')
| -rw-r--r-- | source3/rpc_client/cli_srvsvc.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/source3/rpc_client/cli_srvsvc.c b/source3/rpc_client/cli_srvsvc.c index 1bdd19620b..b6c6b377ff 100644 --- a/source3/rpc_client/cli_srvsvc.c +++ b/source3/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); |