From b652e5b4753afd8916d347d5c8ef6f54ca140097 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 2 Jun 2008 23:55:45 +0200
Subject: netapi: let libnetapi_samr_open_domain return WERROR.

Guenther
(This used to be commit 3d037a07e015a3af75dde054cef4c0bb7795fbb5)
---
 source3/lib/netapi/group.c | 104 +++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 55 deletions(-)

(limited to 'source3/lib/netapi/group.c')

diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 7f905f0185..f56c92175b 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -81,16 +81,15 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	status = libnetapi_samr_open_domain(ctx, pipe_cli,
-					    SAMR_ACCESS_ENUM_DOMAINS |
-					    SAMR_ACCESS_OPEN_DOMAIN,
-					    SAMR_DOMAIN_ACCESS_CREATE_GROUP |
-					    SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
-					    &connect_handle,
-					    &domain_handle,
-					    &domain_sid);
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
+					  SAMR_ACCESS_ENUM_DOMAINS |
+					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_DOMAIN_ACCESS_CREATE_GROUP |
+					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
+					  &connect_handle,
+					  &domain_handle,
+					  &domain_sid);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -262,15 +261,14 @@ WERROR NetGroupDel_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	status = libnetapi_samr_open_domain(ctx, pipe_cli,
-					    SAMR_ACCESS_ENUM_DOMAINS |
-					    SAMR_ACCESS_OPEN_DOMAIN,
-					    SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
-					    &connect_handle,
-					    &domain_handle,
-					    &domain_sid);
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
+					  SAMR_ACCESS_ENUM_DOMAINS |
+					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
+					  &connect_handle,
+					  &domain_handle,
+					  &domain_sid);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -435,15 +433,14 @@ WERROR NetGroupSetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	status = libnetapi_samr_open_domain(ctx, pipe_cli,
-					    SAMR_ACCESS_ENUM_DOMAINS |
-					    SAMR_ACCESS_OPEN_DOMAIN,
-					    SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
-					    &connect_handle,
-					    &domain_handle,
-					    &domain_sid);
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
+					  SAMR_ACCESS_ENUM_DOMAINS |
+					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
+					  &connect_handle,
+					  &domain_handle,
+					  &domain_sid);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -677,15 +674,14 @@ WERROR NetGroupGetInfo_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	status = libnetapi_samr_open_domain(ctx, pipe_cli,
-					    SAMR_ACCESS_ENUM_DOMAINS |
-					    SAMR_ACCESS_OPEN_DOMAIN,
-					    SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
-					    &connect_handle,
-					    &domain_handle,
-					    &domain_sid);
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
+					  SAMR_ACCESS_ENUM_DOMAINS |
+					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
+					  &connect_handle,
+					  &domain_handle,
+					  &domain_sid);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -794,15 +790,14 @@ WERROR NetGroupAddUser_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	status = libnetapi_samr_open_domain(ctx, pipe_cli,
-					    SAMR_ACCESS_ENUM_DOMAINS |
-					    SAMR_ACCESS_OPEN_DOMAIN,
-					    SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
-					    &connect_handle,
-					    &domain_handle,
-					    &domain_sid);
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
+					  SAMR_ACCESS_ENUM_DOMAINS |
+					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
+					  &connect_handle,
+					  &domain_handle,
+					  &domain_sid);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
@@ -925,15 +920,14 @@ WERROR NetGroupDelUser_r(struct libnetapi_ctx *ctx,
 		goto done;
 	}
 
-	status = libnetapi_samr_open_domain(ctx, pipe_cli,
-					    SAMR_ACCESS_ENUM_DOMAINS |
-					    SAMR_ACCESS_OPEN_DOMAIN,
-					    SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
-					    &connect_handle,
-					    &domain_handle,
-					    &domain_sid);
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = libnetapi_samr_open_domain(ctx, pipe_cli,
+					  SAMR_ACCESS_ENUM_DOMAINS |
+					  SAMR_ACCESS_OPEN_DOMAIN,
+					  SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
+					  &connect_handle,
+					  &domain_handle,
+					  &domain_sid);
+	if (!W_ERROR_IS_OK(werr)) {
 		goto done;
 	}
 
-- 
cgit