From: Günther Deschner <gd@samba.org>
Date: Thu, 26 Mar 2009 09:35:55 +0000 (+0100)
Subject: s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong information.
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=fe102f53d1ac6f888bd559eaf52b6a166d5f78d3

s3-net: Fix Bug #6102. NetQueryDisplayInformation could return wrong information.

Guenther
---

diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c
index 84d32dc1d55..2c78f6f8ada 100644
--- a/source/lib/netapi/user.c
+++ b/source/lib/netapi/user.c
@@ -1510,6 +1510,9 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
 
 	NTSTATUS status = NT_STATUS_OK;
 	WERROR werr;
+	WERROR werr_tmp;
+
+	*r->out.entries_read = 0;
 
 	ZERO_STRUCT(connect_handle);
 	ZERO_STRUCT(domain_handle);
@@ -1554,15 +1557,18 @@ WERROR NetQueryDisplayInformation_r(struct libnetapi_ctx *ctx,
 					       &total_size,
 					       &returned_size,
 					       &info);
-	if (!NT_STATUS_IS_OK(status)) {
-		werr = ntstatus_to_werror(status);
+	werr = ntstatus_to_werror(status);
+	if (NT_STATUS_IS_ERR(status)) {
 		goto done;
 	}
 
-	werr = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
-						    r->in.level,
-						    r->out.entries_read,
-						    r->out.buffer);
+	werr_tmp = convert_samr_dispinfo_to_NET_DISPLAY(ctx, &info,
+							r->in.level,
+							r->out.entries_read,
+							r->out.buffer);
+	if (!W_ERROR_IS_OK(werr_tmp)) {
+		werr = werr_tmp;
+	}
  done:
 	if (!cli) {
 		return werr;