Use libnetapi_open_pipe in netapi functions.

Guenther
(This used to be commit 5804d8b112e1da022988c635284eb4799974d4c7)

diff --git a/source3/lib/netapi/getdc.c b/source3/lib/netapi/getdc.c
index 8f882941b3786115df743051527a411018524762..38aaf0ef85c2ed122ced81b42e9bf6472f37c6a1 100644 (file)
--- a/source3/lib/netapi/getdc.c
+++ b/source3/lib/netapi/getdc.c
@@ -50,10 +50,8 @@ WERROR NetGetDCName_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
@@ -92,12 +90,10 @@ WERROR NetGetAnyDCName_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
-       };
+       }
 
        status = rpccli_netr_GetAnyDCName(pipe_cli, ctx,
                                          r->in.server_name,
@@ -152,10 +148,8 @@ WERROR DsGetDcName_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_NETLOGON, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index 056d8d27e252f9a2f2a9b666038993eab9ea806f..8e0a62e820b392f4a3b5006640afcf8ef3336d65 100644 (file)
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -108,10 +108,8 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
@@ -239,10 +237,8 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
@@ -292,10 +288,8 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
@@ -422,10 +416,8 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_WKSSVC,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 

diff --git a/source3/lib/netapi/serverinfo.c b/source3/lib/netapi/serverinfo.c
index 238b9ca30802bd721b5354d97370ac6f561bbc57..58efeb375ddf6fabc44817dc5471a71fd138070b 100644 (file)
--- a/source3/lib/netapi/serverinfo.c
+++ b/source3/lib/netapi/serverinfo.c
@@ -75,12 +75,10 @@ WERROR NetServerGetInfo_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
-       };
+       }
 
        status = rpccli_srvsvc_NetSrvGetInfo(pipe_cli, ctx,
                                             r->in.server_name,
@@ -177,12 +175,10 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC,
-                                           &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_SRVSVC, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
-       };
+       }
 
        switch (r->in.level) {
                case 1005:

diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index d9505bc06796a7c9e54c5726c6fc8c1aded2b2e7..31e5faa5944f90a49c2f89e562c84b322b443d95 100644 (file)
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -185,9 +185,8 @@ WERROR NetUserAdd_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_SAMR, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
@@ -378,9 +377,8 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_SAMR, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
@@ -602,9 +600,8 @@ WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
-       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &status);
-       if (!pipe_cli) {
-               werr = ntstatus_to_werror(status);
+       werr = libnetapi_open_pipe(ctx, cli, PI_SAMR, &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }