From f20effc437970d826c5bd4f047ff47e23e7a1a73 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 10 Dec 2009 14:20:22 +0100
Subject: s3-spoolss: fix enumprinter key client and server.

Guenther
---
 source3/rpc_server/srv_spoolss_nt.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'source3/rpc_server/srv_spoolss_nt.c')

diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 1e66c7c021..0028ec0188 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8786,12 +8786,20 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p,
 		goto done;
 	}
 
-	array = talloc_zero_array(r->out.key_buffer, const char *, num_keys + 1);
+	array = talloc_zero_array(r->out.key_buffer, const char *, num_keys + 2);
 	if (!array) {
 		result = WERR_NOMEM;
 		goto done;
 	}
 
+	if (!num_keys) {
+		array[0] = talloc_strdup(array, "");
+		if (!array[0]) {
+			result = WERR_NOMEM;
+			goto done;
+		}
+	}
+
 	for (i=0; i < num_keys; i++) {
 
 		DEBUG(10,("_spoolss_EnumPrinterKey: adding keyname: %s\n",
@@ -8809,13 +8817,14 @@ WERROR _spoolss_EnumPrinterKey(pipes_struct *p,
 		goto done;
 	}
 
+	*r->out._ndr_size = r->in.offered / 2;
 	*r->out.needed = blob.length;
 
 	if (r->in.offered < *r->out.needed) {
 		result = WERR_MORE_DATA;
 	} else {
 		result = WERR_OK;
-		r->out.key_buffer->string = array;
+		r->out.key_buffer->string_array = array;
 	}
 
  done:
-- 
cgit