From: Günther Deschner <gd@samba.org>
Date: Thu, 10 Apr 2008 20:44:00 +0000 (+0200)
Subject: Use libnetapi_open_pipe in netapi functions.
X-Git-Tag: samba-3.3.0pre1~2749
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5804d8b112e1da022988c635284eb4799974d4c7;p=thirdparty%2Fsamba.git

Use libnetapi_open_pipe in netapi functions.

Guenther
---

diff --git a/source/lib/netapi/getdc.c b/source/lib/netapi/getdc.c
index 8f882941b37..38aaf0ef85c 100644
--- a/source/lib/netapi/getdc.c
+++ b/source/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/source/lib/netapi/joindomain.c b/source/lib/netapi/joindomain.c
index 056d8d27e25..8e0a62e820b 100644
--- a/source/lib/netapi/joindomain.c
+++ b/source/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/source/lib/netapi/serverinfo.c b/source/lib/netapi/serverinfo.c
index 238b9ca3080..58efeb375dd 100644
--- a/source/lib/netapi/serverinfo.c
+++ b/source/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/source/lib/netapi/user.c b/source/lib/netapi/user.c
index d9505bc0679..31e5faa5944 100644
--- a/source/lib/netapi/user.c
+++ b/source/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;
 	}