1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00

s3:spoolss: construct the devmode the same way for level 2 and 8

metze
This commit is contained in:
Stefan Metzmacher 2010-02-19 09:09:40 +01:00 committed by Günther Deschner
parent 1e9df26ef9
commit a2cd203982

View File

@ -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;
r->devmode = construct_dev_mode(mem_ctx, lp_const_servicename(snum));
if (!r->devmode) {
DEBUG(8,("Returning NULL Devicemode!\n"));
}
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 = devmode;
return WERR_OK;
}