From a2cd2039824181494eb1496068d2121ee6150839 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 19 Feb 2010 09:09:40 +0100 Subject: [PATCH] s3:spoolss: construct the devmode the same way for level 2 and 8 metze --- source3/rpc_server/srv_spoolss_nt.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index c555a314655..a5484f8974c 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -3949,25 +3949,11 @@ static WERROR construct_printer_info8(TALLOC_CTX *mem_ctx, struct spoolss_DeviceModeInfo *r, int snum) { - struct spoolss_DeviceMode *devmode; - WERROR result; - - if (!ntprinter->info_2->devmode) { - r->devmode = NULL; - return WERR_OK; - } - - devmode = TALLOC_ZERO_P(mem_ctx, struct spoolss_DeviceMode); - W_ERROR_HAVE_NO_MEMORY(devmode); - - result = convert_nt_devicemode(mem_ctx, devmode, ntprinter->info_2->devmode); - if (!W_ERROR_IS_OK(result)) { - TALLOC_FREE(devmode); - return result; + r->devmode = construct_dev_mode(mem_ctx, lp_const_servicename(snum)); + if (!r->devmode) { + DEBUG(8,("Returning NULL Devicemode!\n")); } - r->devmode = devmode; - return WERR_OK; } -- 2.11.4.GIT