sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

s3-spoolss: Use spoolss_PrinterInfo2 in construct_printer_driver_info_level.

Browse Source 
Signed-off-by: Jim McDonough <jmcd@samba.org>
This commit is contained in:
Simo Sorce 2010-04-26 09:30:10 -04:00
parent 7f6f5806ff
commit 0d694e1261
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/rpc_server/srv_spoolss_nt.c
View File

@ -4811,11 +4811,15 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
const char *architecture,
uint32_t version)
{
NT_PRINTER_INFO_LEVEL *printer = NULL;
struct spoolss_PrinterInfo2 *pinfo2 = NULL;
struct spoolss_DriverInfo8 *driver;
WERROR result;
result = get_a_printer(NULL, &printer, 2, lp_const_servicename(snum));
result = winreg_get_printer(mem_ctx,
server_info,
servername,
lp_const_servicename(snum),
&pinfo2);
DEBUG(8,("construct_printer_driver_info_level: status: %s\n",
win_errstr(result)));
@ -4825,8 +4829,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
}
result = winreg_get_driver(mem_ctx, server_info, architecture,
printer->info_2->drivername,
version, &driver);
pinfo2->drivername, version, &driver);
DEBUG(8,("construct_printer_driver_info_level: status: %s\n",
win_errstr(result)));
@ -4837,19 +4840,19 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
*/
if (version < 3) {
free_a_printer(&printer, 2);
talloc_free(pinfo2);
return WERR_UNKNOWN_PRINTER_DRIVER;
}
/* Yes - try again with a WinNT driver. */
version = 2;
result = winreg_get_driver(mem_ctx, server_info, architecture,
printer->info_2->drivername,
pinfo2->drivername,
version, &driver);
DEBUG(8,("construct_printer_driver_level: status: %s\n",
win_errstr(result)));
if (!W_ERROR_IS_OK(result)) {
free_a_printer(&printer, 2);
talloc_free(pinfo2);
return WERR_UNKNOWN_PRINTER_DRIVER;
}
}
@ -4886,7 +4889,7 @@ static WERROR construct_printer_driver_info_level(TALLOC_CTX *mem_ctx,
break;
}
free_a_printer(&printer, 2);
talloc_free(pinfo2);
talloc_free(driver);
return result;