From d464151f3b47c675664f464b1645ca85de663655 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Fri, 20 Nov 2009 16:34:00 +0100 Subject: s3-spoolss: fix spoolss_EnumPrinterKey client and server code. Guenther --- source3/rpc_client/cli_spoolss.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'source3/rpc_client/cli_spoolss.c') diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c index 02a0e168cb..2dba103069 100644 --- a/source3/rpc_client/cli_spoolss.c +++ b/source3/rpc_client/cli_spoolss.c @@ -810,27 +810,45 @@ WERROR rpccli_spoolss_enumprinterkey(struct rpc_pipe_client *cli, NTSTATUS status; WERROR werror; uint32_t needed; + uint16_t *buffer = NULL; + + *key_buffer = NULL; + + if (offered) { + buffer = talloc_array(mem_ctx, uint16_t, offered); + W_ERROR_HAVE_NO_MEMORY(buffer); + } status = rpccli_spoolss_EnumPrinterKey(cli, mem_ctx, handle, key_name, - key_buffer, + buffer, offered, &needed, &werror); if (W_ERROR_EQUAL(werror, WERR_MORE_DATA)) { offered = needed; - + buffer = talloc_realloc(mem_ctx, buffer, uint16_t, needed); + W_ERROR_HAVE_NO_MEMORY(buffer); status = rpccli_spoolss_EnumPrinterKey(cli, mem_ctx, handle, key_name, - key_buffer, + buffer, offered, &needed, &werror); } + if (W_ERROR_IS_OK(werror)) { + const char **array; + DATA_BLOB blob = data_blob_const((uint8_t *)buffer, offered); + if (!pull_reg_multi_sz(mem_ctx, &blob, &array)) { + return WERR_NOMEM; + } + *key_buffer = array; + } + return werror; } -- cgit